From 2e7510db5fecda69fa5719ff664a29a6649e73ba Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Wed, 29 May 2024 01:49:10 -0600 Subject: [PATCH] Setup d_a_obj Actors (#2161) * checkpoint * checkpoint * checkpoint * checkpoint * checkpoint * checkpoint * checkpoint * finish * add class comments * checkpoint * checkpoint * checkpoint * checkpoint * checkpoint * checkpoint * checkpoint * checkpoint * checkpoint * checkpoint * checkpoint * checkpoint * finish * add class comments * rm duplicate comments * fix build --- Progress.md | 8 +- include/rel/d/a/b/d_a_b_yo/d_a_b_yo.h | 1 - include/rel/d/a/e/d_a_e_bg/d_a_e_bg.h | 1 - include/rel/d/a/e/d_a_e_bug/d_a_e_bug.h | 1 - include/rel/d/a/e/d_a_e_dk/d_a_e_dk.h | 1 - include/rel/d/a/e/d_a_e_dt/d_a_e_dt.h | 1 - include/rel/d/a/e/d_a_e_fb/d_a_e_fb.h | 1 - include/rel/d/a/e/d_a_e_ga/d_a_e_ga.h | 1 - include/rel/d/a/e/d_a_e_gi/d_a_e_gi.h | 1 - include/rel/d/a/e/d_a_e_gm/d_a_e_gm.h | 1 - include/rel/d/a/e/d_a_e_gs/d_a_e_gs.h | 1 - include/rel/d/a/e/d_a_e_hm/d_a_e_hm.h | 1 - include/rel/d/a/e/d_a_e_hp/d_a_e_hp.h | 1 - include/rel/d/a/e/d_a_e_kk/d_a_e_kk.h | 1 - include/rel/d/a/e/d_a_e_oc/d_a_e_oc.h | 1 - include/rel/d/a/e/d_a_e_ot/d_a_e_ot.h | 1 - include/rel/d/a/e/d_a_e_pz/d_a_e_pz.h | 1 - include/rel/d/a/e/d_a_e_sw/d_a_e_sw.h | 1 - include/rel/d/a/e/d_a_e_tt/d_a_e_tt.h | 1 - include/rel/d/a/e/d_a_e_vt/d_a_e_vt.h | 2 + .../d/a/e/d_a_e_warpappear/d_a_e_warpappear.h | 1 - include/rel/d/a/e/d_a_e_ws/d_a_e_ws.h | 1 - include/rel/d/a/e/d_a_e_ww/d_a_e_ww.h | 1 - include/rel/d/a/e/d_a_e_ymb/d_a_e_ymb.h | 1 - include/rel/d/a/e/d_a_e_zh/d_a_e_zh.h | 1 - include/rel/d/a/e/d_a_e_zm/d_a_e_zm.h | 1 - include/rel/d/a/e/d_a_e_zs/d_a_e_zs.h | 1 - .../d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.h | 21 +- .../d/a/obj/d_a_obj_Turara/d_a_obj_Turara.h | 48 +- .../d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst.h | 39 +- .../a/obj/d_a_obj_Y_taihou/d_a_obj_Y_taihou.h | 35 + .../d_a_obj_amiShutter/d_a_obj_amiShutter.h | 44 +- include/rel/d/a/obj/d_a_obj_ari/d_a_obj_ari.h | 9 + .../a/obj/d_a_obj_automata/d_a_obj_automata.h | 38 ++ .../obj/d_a_obj_avalanche/d_a_obj_avalanche.h | 8 + .../d/a/obj/d_a_obj_balloon/d_a_obj_balloon.h | 8 + .../d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.h | 8 + .../rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.h | 42 +- .../rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.h | 11 +- include/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.h | 8 + .../rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.h | 80 +++ .../d/a/obj/d_a_obj_bhashi/d_a_obj_bhashi.h | 43 ++ .../a/obj/d_a_obj_bhbridge/d_a_obj_bhbridge.h | 28 +- .../d/a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.h | 8 + .../d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.h | 8 + .../a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock.h | 46 +- .../a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.h | 10 + .../obj/d_a_obj_bmshutter/d_a_obj_bmshutter.h | 39 +- .../rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.h | 12 +- .../a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.h | 10 +- .../d/a/obj/d_a_obj_boumato/d_a_obj_boumato.h | 41 ++ .../a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.h | 16 + include/rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.h | 22 + .../d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.h | 10 +- .../d_a_obj_bubblePilar/d_a_obj_bubblePilar.h | 38 +- .../d/a/obj/d_a_obj_burnbox/d_a_obj_burnbox.h | 26 + .../rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h | 25 +- .../d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.h | 11 +- include/rel/d/a/obj/d_a_obj_cb/d_a_obj_cb.h | 23 +- .../d/a/obj/d_a_obj_cblock/d_a_obj_cblock.h | 39 ++ .../d/a/obj/d_a_obj_cboard/d_a_obj_cboard.h | 11 +- .../rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.h | 9 + .../d_a_obj_chandelier/d_a_obj_chandelier.h | 9 + .../rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.h | 12 +- include/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.h | 9 + .../d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.h | 12 +- .../rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.h | 11 + .../a/obj/d_a_obj_crvfence/d_a_obj_crvfence.h | 35 +- .../d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate.h | 47 +- .../a/obj/d_a_obj_crvhahen/d_a_obj_crvhahen.h | 28 +- .../d_a_obj_crvlh_down/d_a_obj_crvlh_down.h | 30 + .../a/obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up.h | 29 +- .../a/obj/d_a_obj_crvsteel/d_a_obj_crvsteel.h | 31 +- .../d/a/obj/d_a_obj_crystal/d_a_obj_crystal.h | 10 + .../rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall.h | 50 ++ .../d/a/obj/d_a_obj_damCps/d_a_obj_damCps.h | 2 +- include/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.h | 44 ++ .../d/a/obj/d_a_obj_digholl/d_a_obj_digholl.h | 9 + .../a/obj/d_a_obj_digplace/d_a_obj_digplace.h | 11 + .../d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.h | 8 + .../d_a_obj_dmelevator/d_a_obj_dmelevator.h | 91 +++ .../rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.h | 38 ++ .../rel/d/a/obj/d_a_obj_dust/d_a_obj_dust.h | 29 +- include/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.h | 22 + .../d_a_obj_enemy_create.h | 11 +- .../d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj.h | 56 ++ include/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.h | 13 +- .../d/a/obj/d_a_obj_fchain/d_a_obj_fchain.h | 32 +- .../a/obj/d_a_obj_fireWood/d_a_obj_fireWood.h | 56 ++ .../obj/d_a_obj_fireWood2/d_a_obj_fireWood2.h | 51 ++ .../d_a_obj_firepillar/d_a_obj_firepillar.h | 32 + .../d_a_obj_firepillar2/d_a_obj_firepillar2.h | 33 + .../rel/d/a/obj/d_a_obj_flag/d_a_obj_flag.h | 34 +- .../rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.h | 44 ++ .../rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3.h | 37 +- .../rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.h | 8 + .../rel/d/a/obj/d_a_obj_food/d_a_obj_food.h | 8 + include/rel/d/a/obj/d_a_obj_fw/d_a_obj_fw.h | 23 +- .../d/a/obj/d_a_obj_gadget/d_a_obj_gadget.h | 41 ++ .../obj/d_a_obj_ganonwall/d_a_obj_ganonwall.h | 35 + .../d_a_obj_ganonwall2/d_a_obj_ganonwall2.h | 27 +- include/rel/d/a/obj/d_a_obj_gb/d_a_obj_gb.h | 17 +- .../d/a/obj/d_a_obj_geyser/d_a_obj_geyser.h | 56 ++ .../d_a_obj_glowSphere/d_a_obj_glowSphere.h | 67 +- include/rel/d/a/obj/d_a_obj_gm/d_a_obj_gm.h | 28 + .../d/a/obj/d_a_obj_goGate/d_a_obj_goGate.h | 39 +- .../a/obj/d_a_obj_gomikabe/d_a_obj_gomikabe.h | 43 ++ .../d/a/obj/d_a_obj_gpTaru/d_a_obj_gpTaru.h | 54 +- .../rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.h | 162 ++++- .../d/a/obj/d_a_obj_graWall/d_a_obj_graWall.h | 14 +- .../a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock.h | 36 +- .../d_a_obj_grave_stone/d_a_obj_grave_stone.h | 9 + .../d_a_obj_groundwater/d_a_obj_groundwater.h | 42 +- .../a/obj/d_a_obj_grz_rock/d_a_obj_grz_rock.h | 29 +- .../d/a/obj/d_a_obj_h_saku/d_a_obj_h_saku.h | 29 +- .../obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.h | 32 +- .../obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr.h | 32 +- .../rel/d/a/obj/d_a_obj_hasu2/d_a_obj_hasu2.h | 33 +- include/rel/d/a/obj/d_a_obj_hb/d_a_obj_hb.h | 16 + .../obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya.h | 11 + .../d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw.h | 8 + .../rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.h | 31 +- .../d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.h | 36 + .../a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.h | 12 +- .../rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.h | 10 + .../rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.h | 36 +- .../a/obj/d_a_obj_iceblock/d_a_obj_iceblock.h | 49 ++ .../d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.h | 13 + .../rel/d/a/obj/d_a_obj_ihasi/d_a_obj_ihasi.h | 17 +- .../rel/d/a/obj/d_a_obj_ikada/d_a_obj_ikada.h | 28 +- .../d/a/obj/d_a_obj_inobone/d_a_obj_inobone.h | 27 + include/rel/d/a/obj/d_a_obj_ita/d_a_obj_ita.h | 34 +- .../d/a/obj/d_a_obj_itamato/d_a_obj_itamato.h | 40 ++ include/rel/d/a/obj/d_a_obj_ito/d_a_obj_ito.h | 24 + .../d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.h | 15 +- include/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.h | 41 +- .../rel/d/a/obj/d_a_obj_kage/d_a_obj_kage.h | 17 +- .../rel/d/a/obj/d_a_obj_kago/d_a_obj_kago.h | 41 ++ .../d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.h | 26 + .../a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri.h | 46 ++ .../d/a/obj/d_a_obj_kanban2/d_a_obj_kanban2.h | 57 +- .../d/a/obj/d_a_obj_kantera/d_a_obj_kantera.h | 66 ++ .../d_a_obj_katatsumuri/d_a_obj_katatsumuri.h | 43 ++ .../a/obj/d_a_obj_kazeneko/d_a_obj_kazeneko.h | 26 + .../d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket.h | 41 ++ .../rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.h | 22 + include/rel/d/a/obj/d_a_obj_key/d_a_obj_key.h | 23 +- .../d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.h | 30 +- .../rel/d/a/obj/d_a_obj_kgate/d_a_obj_kgate.h | 9 + include/rel/d/a/obj/d_a_obj_ki/d_a_obj_ki.h | 8 + .../rel/d/a/obj/d_a_obj_kiPot/d_a_obj_kiPot.h | 34 +- .../rel/d/a/obj/d_a_obj_kita/d_a_obj_kita.h | 29 +- .../rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.h | 12 +- .../d/a/obj/d_a_obj_kkanban/d_a_obj_kkanban.h | 11 +- .../d/a/obj/d_a_obj_klift00/d_a_obj_klift00.h | 31 + .../a/obj/d_a_obj_knBullet/d_a_obj_knBullet.h | 26 + .../a/obj/d_a_obj_kshutter/d_a_obj_kshutter.h | 59 +- .../a/obj/d_a_obj_ktOnFire/d_a_obj_ktOnFire.h | 36 +- .../a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata.h | 46 ++ .../a/obj/d_a_obj_kwheel00/d_a_obj_kwheel00.h | 27 + .../a/obj/d_a_obj_kwheel01/d_a_obj_kwheel01.h | 28 +- .../d/a/obj/d_a_obj_kznkarm/d_a_obj_kznkarm.h | 38 +- .../d/a/obj/d_a_obj_ladder/d_a_obj_ladder.h | 57 +- .../d/a/obj/d_a_obj_laundry/d_a_obj_laundry.h | 32 + .../d_a_obj_laundry_rope.h | 24 + .../rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.h | 11 +- .../d_a_obj_life_container.h | 42 ++ include/rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.h | 23 +- .../d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.h | 25 +- .../d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.h | 27 +- .../obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle.h | 44 +- .../obj/d_a_obj_lv3Candle/d_a_obj_lv3Candle.h | 26 +- .../a/obj/d_a_obj_lv3Water/d_a_obj_lv3Water.h | 37 +- .../obj/d_a_obj_lv3Water2/d_a_obj_lv3Water2.h | 36 +- .../obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.h | 9 + .../obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.h | 9 + .../d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.h | 10 + .../d_a_obj_lv4CandleDemoTag.h | 65 ++ .../d_a_obj_lv4CandleTag.h | 8 + .../d_a_obj_lv4EdShutter.h | 46 +- .../d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate.h | 8 + .../d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.h | 10 + .../obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.h | 44 +- .../d_a_obj_lv4RailWall/d_a_obj_lv4RailWall.h | 36 +- .../d_a_obj_lv4SlideWall.h | 39 +- .../obj/d_a_obj_lv4bridge/d_a_obj_lv4bridge.h | 36 +- .../d_a_obj_lv4chandelier.h | 42 ++ .../d_a_obj_lv4digsand/d_a_obj_lv4digsand.h | 34 +- .../a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor.h | 10 + .../d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.h | 9 + .../d_a_obj_lv4prelvtr/d_a_obj_lv4prelvtr.h | 27 +- .../obj/d_a_obj_lv4prwall/d_a_obj_lv4prwall.h | 27 +- .../d/a/obj/d_a_obj_lv4sand/d_a_obj_lv4sand.h | 36 +- .../d_a_obj_lv5FloorBoard.h | 39 +- .../d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.h | 39 +- .../a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.h | 39 +- .../d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.h | 27 + .../d_a_obj_lv5yiblltray.h | 31 + .../d_a_obj_lv6ChangeGate.h | 46 +- .../d_a_obj_lv6FurikoTrap.h | 37 +- .../obj/d_a_obj_lv6Lblock/d_a_obj_lv6Lblock.h | 39 +- .../obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate.h | 44 +- .../obj/d_a_obj_lv6SzGate/d_a_obj_lv6SzGate.h | 43 +- .../obj/d_a_obj_lv6Tenbin/d_a_obj_lv6Tenbin.h | 37 +- .../d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll.h | 56 +- .../d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap.h | 69 +- .../a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.h | 30 + .../obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.h | 48 ++ .../a/obj/d_a_obj_lv6egate/d_a_obj_lv6egate.h | 28 + .../obj/d_a_obj_lv6elevta/d_a_obj_lv6elevta.h | 29 +- .../obj/d_a_obj_lv6swturn/d_a_obj_lv6swturn.h | 32 +- .../obj/d_a_obj_lv7BsGate/d_a_obj_lv7BsGate.h | 38 +- .../d_a_obj_lv7PropellerY.h | 42 +- .../obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge.h | 31 + .../d_a_obj_lv8KekkaiTrap.h | 38 +- .../d/a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift.h | 57 +- .../d_a_obj_lv8OptiLift/d_a_obj_lv8OptiLift.h | 56 +- .../d_a_obj_lv8UdFloor/d_a_obj_lv8UdFloor.h | 43 +- .../d_a_obj_lv9SwShutter.h | 38 +- .../d/a/obj/d_a_obj_magLift/d_a_obj_magLift.h | 47 +- .../d_a_obj_magLiftRot/d_a_obj_magLiftRot.h | 80 +++ .../obj/d_a_obj_magne_arm/d_a_obj_magne_arm.h | 87 ++- .../rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.h | 22 + .../d_a_obj_master_sword.h | 60 ++ .../rel/d/a/obj/d_a_obj_mato/d_a_obj_mato.h | 37 +- .../a/obj/d_a_obj_metalbox/d_a_obj_metalbox.h | 27 +- .../rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.h | 9 + .../rel/d/a/obj/d_a_obj_mhole/d_a_obj_mhole.h | 29 + include/rel/d/a/obj/d_a_obj_mie/d_a_obj_mie.h | 40 ++ .../d/a/obj/d_a_obj_movebox/d_a_obj_movebox.h | 17 +- .../rel/d/a/obj/d_a_obj_msima/d_a_obj_msima.h | 28 +- .../d/a/obj/d_a_obj_mvstair/d_a_obj_mvstair.h | 43 +- .../d/a/obj/d_a_obj_myogan/d_a_obj_myogan.h | 8 + .../d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.h | 47 +- .../obj/d_a_obj_nameplate/d_a_obj_nameplate.h | 35 + include/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.h | 43 +- .../rel/d/a/obj/d_a_obj_ndoor/d_a_obj_ndoor.h | 16 + .../rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu.h | 40 +- .../a/obj/d_a_obj_octhashi/d_a_obj_octhashi.h | 34 + .../d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.h | 11 + .../rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.h | 12 +- .../obj/d_a_obj_onsenFire/d_a_obj_onsenFire.h | 8 + .../obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.h | 50 +- .../d_a_obj_ornament_cloth.h | 32 +- .../rel/d/a/obj/d_a_obj_pdoor/d_a_obj_pdoor.h | 32 +- .../d/a/obj/d_a_obj_pdtile/d_a_obj_pdtile.h | 27 + .../d/a/obj/d_a_obj_pdwall/d_a_obj_pdwall.h | 27 +- .../d/a/obj/d_a_obj_picture/d_a_obj_picture.h | 41 +- .../d/a/obj/d_a_obj_pillar/d_a_obj_pillar.h | 41 ++ .../rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.h | 16 +- .../a/obj/d_a_obj_poCandle/d_a_obj_poCandle.h | 46 +- .../d/a/obj/d_a_obj_poFire/d_a_obj_poFire.h | 53 +- .../d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.h | 39 +- .../rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.h | 12 +- .../d/a/obj/d_a_obj_pumpkin/d_a_obj_pumpkin.h | 43 ++ .../d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.h | 10 + .../d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.h | 43 +- .../rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.h | 9 + .../obj/d_a_obj_riverrock/d_a_obj_riverrock.h | 41 ++ .../rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.h | 12 +- .../d_a_obj_rope_bridge/d_a_obj_rope_bridge.h | 41 ++ .../obj/d_a_obj_rotBridge/d_a_obj_rotBridge.h | 34 +- .../d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap.h | 42 +- .../rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.h | 29 +- .../d/a/obj/d_a_obj_rstair/d_a_obj_rstair.h | 41 +- include/rel/d/a/obj/d_a_obj_rw/d_a_obj_rw.h | 28 + .../d_a_obj_sWallShutter.h | 40 +- .../d/a/obj/d_a_obj_saidan/d_a_obj_saidan.h | 11 +- .../d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita.h | 27 +- .../d_a_obj_sakuita_rope.h | 46 +- .../d/a/obj/d_a_obj_scannon/d_a_obj_scannon.h | 65 +- .../d_a_obj_scannon_crs/d_a_obj_scannon_crs.h | 41 +- .../d_a_obj_scannon_ten/d_a_obj_scannon_ten.h | 56 +- .../a/obj/d_a_obj_sekidoor/d_a_obj_sekidoor.h | 36 +- .../d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.h | 13 +- .../d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.h | 8 + .../d/a/obj/d_a_obj_shield/d_a_obj_shield.h | 39 ++ .../d/a/obj/d_a_obj_sm_door/d_a_obj_sm_door.h | 32 +- .../a/obj/d_a_obj_smallkey/d_a_obj_smallkey.h | 8 + .../d/a/obj/d_a_obj_smgdoor/d_a_obj_smgdoor.h | 40 +- .../rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.h | 10 + .../d/a/obj/d_a_obj_smtile/d_a_obj_smtile.h | 37 +- .../obj/d_a_obj_smw_stone/d_a_obj_smw_stone.h | 13 + .../d_a_obj_snowEffTag/d_a_obj_snowEffTag.h | 10 + .../obj/d_a_obj_snow_soup/d_a_obj_snow_soup.h | 9 + include/rel/d/a/obj/d_a_obj_so/d_a_obj_so.h | 22 + .../a/obj/d_a_obj_spinLift/d_a_obj_spinLift.h | 40 +- .../a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink.h | 52 +- .../d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.h | 9 + .../d_a_obj_stairBlock/d_a_obj_stairBlock.h | 35 +- .../rel/d/a/obj/d_a_obj_stick/d_a_obj_stick.h | 40 +- .../rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.h | 10 + .../obj/d_a_obj_stoneMark/d_a_obj_stoneMark.h | 10 + .../d/a/obj/d_a_obj_stopper/d_a_obj_stopper.h | 14 +- .../a/obj/d_a_obj_stopper2/d_a_obj_stopper2.h | 47 ++ .../d/a/obj/d_a_obj_suisya/d_a_obj_suisya.h | 10 + include/rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.h | 22 + .../d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.h | 10 + .../d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.h | 10 + .../d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.h | 12 +- .../d/a/obj/d_a_obj_swLight/d_a_obj_swLight.h | 37 + .../d/a/obj/d_a_obj_swchain/d_a_obj_swchain.h | 39 ++ .../d/a/obj/d_a_obj_swhang/d_a_obj_swhang.h | 12 +- .../rel/d/a/obj/d_a_obj_sword/d_a_obj_sword.h | 30 +- .../d_a_obj_swpropeller/d_a_obj_swpropeller.h | 9 + .../d/a/obj/d_a_obj_swpush/d_a_obj_swpush.h | 78 ++- .../d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2.h | 78 ++- .../d/a/obj/d_a_obj_swpush5/d_a_obj_swpush5.h | 49 +- .../obj/d_a_obj_swspinner/d_a_obj_swspinner.h | 11 +- .../d/a/obj/d_a_obj_swturn/d_a_obj_swturn.h | 34 +- .../d/a/obj/d_a_obj_syRock/d_a_obj_syRock.h | 53 +- .../a/obj/d_a_obj_szbridge/d_a_obj_szbridge.h | 29 +- .../d/a/obj/d_a_obj_taFence/d_a_obj_taFence.h | 43 +- .../rel/d/a/obj/d_a_obj_table/d_a_obj_table.h | 11 +- .../obj/d_a_obj_takaraDai/d_a_obj_takaraDai.h | 34 +- .../d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.h | 22 + include/rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.h | 45 ++ .../a/obj/d_a_obj_testcube/d_a_obj_testcube.h | 2 +- .../rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.h | 10 + .../d/a/obj/d_a_obj_thashi/d_a_obj_thashi.h | 26 + .../d/a/obj/d_a_obj_thdoor/d_a_obj_thdoor.h | 35 + .../a/obj/d_a_obj_timeFire/d_a_obj_timeFire.h | 34 +- .../rel/d/a/obj/d_a_obj_timer/d_a_obj_timer.h | 39 +- include/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.h | 54 +- .../rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.h | 12 +- .../d_a_obj_toaru_maki/d_a_obj_toaru_maki.h | 29 + .../rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.h | 28 +- .../obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse.h | 35 +- .../a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap.h | 45 +- .../rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.h | 47 ++ .../d/a/obj/d_a_obj_tornado/d_a_obj_tornado.h | 12 +- .../a/obj/d_a_obj_tornado2/d_a_obj_tornado2.h | 12 +- include/rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.h | 16 + .../d/a/obj/d_a_obj_treesh/d_a_obj_treesh.h | 33 +- .../d/a/obj/d_a_obj_twGate/d_a_obj_twGate.h | 29 +- .../rel/d/a/obj/d_a_obj_udoor/d_a_obj_udoor.h | 16 + .../rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.h | 9 + .../d/a/obj/d_a_obj_vground/d_a_obj_vground.h | 13 +- .../a/obj/d_a_obj_volcball/d_a_obj_volcball.h | 135 ++++ .../d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.h | 64 ++ .../obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.h | 52 +- .../obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg.h | 38 +- .../obj/d_a_obj_waterGate/d_a_obj_waterGate.h | 40 +- .../d_a_obj_waterPillar/d_a_obj_waterPillar.h | 64 +- .../obj/d_a_obj_waterfall/d_a_obj_waterfall.h | 28 + .../d/a/obj/d_a_obj_wchain/d_a_obj_wchain.h | 12 +- .../d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick.h | 52 +- .../rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.h | 11 +- .../rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.h | 11 +- .../d_a_obj_well_cover/d_a_obj_well_cover.h | 12 +- .../rel/d/a/obj/d_a_obj_wflag/d_a_obj_wflag.h | 15 +- .../d_a_obj_wind_stone/d_a_obj_wind_stone.h | 10 + .../d/a/obj/d_a_obj_window/d_a_obj_window.h | 9 + .../d_a_obj_wood_pendulum.h | 37 + .../d_a_obj_wood_statue/d_a_obj_wood_statue.h | 40 ++ .../d/a/obj/d_a_obj_wsword/d_a_obj_wsword.h | 9 + .../d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag.h | 48 +- .../a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.h | 8 + .../d/a/obj/d_a_obj_yousei/d_a_obj_yousei.h | 37 + .../d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h | 9 + .../d/a/obj/d_a_obj_zcloth/d_a_obj_zcloth.h | 11 +- .../rel/d/a/obj/d_a_obj_zdoor/d_a_obj_zdoor.h | 38 ++ .../a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.h | 10 + .../d_a_obj_zrTuraraRock.h | 10 + .../d/a/obj/d_a_obj_zraMark/d_a_obj_zraMark.h | 31 + .../d_a_obj_zra_freeze/d_a_obj_zra_freeze.h | 8 + .../a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.h | 9 + .../d_a_obj_mirror_6pole.h | 10 + .../d_a_obj_mirror_chain.h | 10 + .../d_a_obj_mirror_sand/d_a_obj_mirror_sand.h | 10 + .../d_a_obj_mirror_screw.h | 9 + .../d_a_obj_mirror_table.h | 8 + .../rel/d/a/tag/d_a_tag_yami/d_a_tag_yami.h | 2 +- rel/d/a/e/d_a_e_vt/d_a_e_vt.cpp | 1 + rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp | 123 +--- rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara.cpp | 320 ++------- .../a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst.cpp | 191 +----- .../obj/d_a_obj_Y_taihou/d_a_obj_Y_taihou.cpp | 183 +---- .../d_a_obj_amiShutter/d_a_obj_amiShutter.cpp | 180 +---- .../obj/d_a_obj_automata/d_a_obj_automata.cpp | 209 +----- .../d_a_obj_avalanche/d_a_obj_avalanche.cpp | 8 +- rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.cpp | 302 ++------- rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp | 8 +- rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.cpp | 348 ++-------- rel/d/a/obj/d_a_obj_bhashi/d_a_obj_bhashi.cpp | 190 +----- .../obj/d_a_obj_bhbridge/d_a_obj_bhbridge.cpp | 177 +---- rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.cpp | 8 +- .../obj/d_a_obj_bky_rock/d_a_obj_bky_rock.cpp | 256 +------ .../d_a_obj_bmshutter/d_a_obj_bmshutter.cpp | 156 +---- .../obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp | 10 +- .../a/obj/d_a_obj_boumato/d_a_obj_boumato.cpp | 204 +----- .../obj/d_a_obj_brakeeff/d_a_obj_brakeeff.cpp | 147 +--- rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.cpp | 156 +---- .../d_a_obj_bubblePilar.cpp | 221 +----- .../a/obj/d_a_obj_burnbox/d_a_obj_burnbox.cpp | 124 +--- rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp | 8 - .../a/obj/d_a_obj_catdoor/d_a_obj_catdoor.cpp | 8 +- rel/d/a/obj/d_a_obj_cb/d_a_obj_cb.cpp | 185 +---- rel/d/a/obj/d_a_obj_cblock/d_a_obj_cblock.cpp | 127 +--- rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.cpp | 45 +- .../obj/d_a_obj_crvfence/d_a_obj_crvfence.cpp | 249 ++----- .../a/obj/d_a_obj_crvgate/d_a_obj_crvgate.cpp | 279 ++------ .../obj/d_a_obj_crvhahen/d_a_obj_crvhahen.cpp | 143 +--- .../d_a_obj_crvlh_down/d_a_obj_crvlh_down.cpp | 165 +---- .../obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up.cpp | 189 +----- .../obj/d_a_obj_crvsteel/d_a_obj_crvsteel.cpp | 149 +--- rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall.cpp | 168 +---- rel/d/a/obj/d_a_obj_damCps/d_a_obj_damCps.cpp | 44 +- rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.cpp | 256 +------ .../d_a_obj_dmelevator/d_a_obj_dmelevator.cpp | 115 +--- rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.cpp | 243 ++----- rel/d/a/obj/d_a_obj_dust/d_a_obj_dust.cpp | 176 +---- rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp | 4 - .../a/obj/d_a_obj_fallobj/d_a_obj_fallobj.cpp | 83 +-- rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.cpp | 162 +---- .../obj/d_a_obj_fireWood/d_a_obj_fireWood.cpp | 80 +-- .../d_a_obj_fireWood2/d_a_obj_fireWood2.cpp | 78 +-- .../d_a_obj_firepillar/d_a_obj_firepillar.cpp | 119 +--- .../d_a_obj_firepillar2.cpp | 188 +---- rel/d/a/obj/d_a_obj_flag/d_a_obj_flag.cpp | 133 +--- rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.cpp | 179 +---- rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3.cpp | 228 ++----- rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.cpp | 8 +- rel/d/a/obj/d_a_obj_fw/d_a_obj_fw.cpp | 145 +--- rel/d/a/obj/d_a_obj_gadget/d_a_obj_gadget.cpp | 199 +----- .../d_a_obj_ganonwall/d_a_obj_ganonwall.cpp | 63 +- .../d_a_obj_ganonwall2/d_a_obj_ganonwall2.cpp | 158 +---- rel/d/a/obj/d_a_obj_gb/d_a_obj_gb.cpp | 164 +---- rel/d/a/obj/d_a_obj_geyser/d_a_obj_geyser.cpp | 161 +---- .../d_a_obj_glowSphere/d_a_obj_glowSphere.cpp | 314 ++------- rel/d/a/obj/d_a_obj_gm/d_a_obj_gm.cpp | 166 +---- rel/d/a/obj/d_a_obj_goGate/d_a_obj_goGate.cpp | 154 +---- .../obj/d_a_obj_gomikabe/d_a_obj_gomikabe.cpp | 211 +----- rel/d/a/obj/d_a_obj_gpTaru/d_a_obj_gpTaru.cpp | 327 ++------- rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.cpp | 641 ++---------------- .../obj/d_a_obj_gra_rock/d_a_obj_gra_rock.cpp | 266 +------- .../d_a_obj_groundwater.cpp | 182 +---- .../obj/d_a_obj_grz_rock/d_a_obj_grz_rock.cpp | 170 +---- rel/d/a/obj/d_a_obj_h_saku/d_a_obj_h_saku.cpp | 193 +----- .../d_a_obj_hakai_brl/d_a_obj_hakai_brl.cpp | 201 +----- .../d_a_obj_hakai_ftr/d_a_obj_hakai_ftr.cpp | 210 +----- rel/d/a/obj/d_a_obj_hasu2/d_a_obj_hasu2.cpp | 132 +--- rel/d/a/obj/d_a_obj_hb/d_a_obj_hb.cpp | 183 +---- .../d_a_obj_hbombkoya/d_a_obj_hbombkoya.cpp | 39 +- rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.cpp | 135 +--- rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.cpp | 185 +---- rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.cpp | 45 +- rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.cpp | 142 +--- .../obj/d_a_obj_iceblock/d_a_obj_iceblock.cpp | 263 +------ .../a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.cpp | 208 +----- rel/d/a/obj/d_a_obj_ihasi/d_a_obj_ihasi.cpp | 143 +--- rel/d/a/obj/d_a_obj_ikada/d_a_obj_ikada.cpp | 158 +---- .../a/obj/d_a_obj_inobone/d_a_obj_inobone.cpp | 131 +--- rel/d/a/obj/d_a_obj_ita/d_a_obj_ita.cpp | 191 +----- .../a/obj/d_a_obj_itamato/d_a_obj_itamato.cpp | 214 +----- rel/d/a/obj/d_a_obj_ito/d_a_obj_ito.cpp | 149 +--- rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.cpp | 306 ++------- rel/d/a/obj/d_a_obj_kage/d_a_obj_kage.cpp | 97 +-- rel/d/a/obj/d_a_obj_kago/d_a_obj_kago.cpp | 200 +----- rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.cpp | 129 +--- .../obj/d_a_obj_kamakiri/d_a_obj_kamakiri.cpp | 256 +------ .../a/obj/d_a_obj_kanban2/d_a_obj_kanban2.cpp | 308 +-------- .../a/obj/d_a_obj_kantera/d_a_obj_kantera.cpp | 100 +-- .../d_a_obj_katatsumuri.cpp | 262 +------ .../obj/d_a_obj_kazeneko/d_a_obj_kazeneko.cpp | 107 +-- .../a/obj/d_a_obj_kbacket/d_a_obj_kbacket.cpp | 199 +----- rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.cpp | 216 +----- rel/d/a/obj/d_a_obj_key/d_a_obj_key.cpp | 224 ++---- .../a/obj/d_a_obj_keyhole/d_a_obj_keyhole.cpp | 95 +-- rel/d/a/obj/d_a_obj_kiPot/d_a_obj_kiPot.cpp | 86 +-- rel/d/a/obj/d_a_obj_kita/d_a_obj_kita.cpp | 138 +--- .../a/obj/d_a_obj_klift00/d_a_obj_klift00.cpp | 139 +--- .../obj/d_a_obj_knBullet/d_a_obj_knBullet.cpp | 103 +-- .../obj/d_a_obj_kshutter/d_a_obj_kshutter.cpp | 234 +------ .../obj/d_a_obj_ktOnFire/d_a_obj_ktOnFire.cpp | 164 +---- .../obj/d_a_obj_kuwagata/d_a_obj_kuwagata.cpp | 256 +------ .../obj/d_a_obj_kwheel00/d_a_obj_kwheel00.cpp | 154 +---- .../obj/d_a_obj_kwheel01/d_a_obj_kwheel01.cpp | 181 +---- .../a/obj/d_a_obj_kznkarm/d_a_obj_kznkarm.cpp | 201 +----- rel/d/a/obj/d_a_obj_ladder/d_a_obj_ladder.cpp | 196 +----- .../a/obj/d_a_obj_laundry/d_a_obj_laundry.cpp | 133 +--- .../d_a_obj_laundry_rope.cpp | 99 +-- .../d_a_obj_life_container.cpp | 251 ++----- rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.cpp | 134 +--- .../d_a_obj_lv2Candle/d_a_obj_lv2Candle.cpp | 8 +- .../obj/d_a_obj_lv3Water/d_a_obj_lv3Water.cpp | 215 +----- .../d_a_obj_lv3Water2/d_a_obj_lv3Water2.cpp | 204 +----- .../d_a_obj_lv4CandleDemoTag.cpp | 110 +-- .../d_a_obj_lv4EdShutter.cpp | 171 +---- .../d_a_obj_lv4RailWall.cpp | 234 ++----- .../d_a_obj_lv4SlideWall.cpp | 152 +---- .../d_a_obj_lv4bridge/d_a_obj_lv4bridge.cpp | 169 +---- .../d_a_obj_lv4chandelier.cpp | 191 +----- .../d_a_obj_lv4digsand/d_a_obj_lv4digsand.cpp | 206 ++---- .../d_a_obj_lv4prelvtr/d_a_obj_lv4prelvtr.cpp | 113 +-- .../d_a_obj_lv4prwall/d_a_obj_lv4prwall.cpp | 143 +--- .../a/obj/d_a_obj_lv4sand/d_a_obj_lv4sand.cpp | 183 +---- .../d_a_obj_lv5FloorBoard.cpp | 218 +----- .../d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.cpp | 235 ++----- .../obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.cpp | 218 +----- .../d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.cpp | 119 +--- .../d_a_obj_lv5yiblltray.cpp | 167 +---- .../d_a_obj_lv6ChangeGate.cpp | 261 ++----- .../d_a_obj_lv6FurikoTrap.cpp | 195 +----- .../d_a_obj_lv6Lblock/d_a_obj_lv6Lblock.cpp | 146 +--- .../d_a_obj_lv6SwGate/d_a_obj_lv6SwGate.cpp | 259 ++----- .../d_a_obj_lv6SzGate/d_a_obj_lv6SzGate.cpp | 207 +----- .../d_a_obj_lv6Tenbin/d_a_obj_lv6Tenbin.cpp | 169 +---- .../d_a_obj_lv6TogeRoll.cpp | 271 ++------ .../d_a_obj_lv6TogeTrap.cpp | 291 ++------ .../obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.cpp | 201 +----- .../d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.cpp | 224 +----- .../obj/d_a_obj_lv6egate/d_a_obj_lv6egate.cpp | 129 +--- .../d_a_obj_lv6elevta/d_a_obj_lv6elevta.cpp | 153 +---- .../d_a_obj_lv6swturn/d_a_obj_lv6swturn.cpp | 150 +--- .../d_a_obj_lv7BsGate/d_a_obj_lv7BsGate.cpp | 151 +---- .../d_a_obj_lv7PropellerY.cpp | 148 +--- .../d_a_obj_lv7bridge/d_a_obj_lv7bridge.cpp | 214 +----- .../d_a_obj_lv8KekkaiTrap.cpp | 142 +--- .../a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift.cpp | 244 +------ .../d_a_obj_lv8OptiLift.cpp | 212 +----- .../d_a_obj_lv8UdFloor/d_a_obj_lv8UdFloor.cpp | 155 +---- .../d_a_obj_lv9SwShutter.cpp | 149 +--- .../a/obj/d_a_obj_magLift/d_a_obj_magLift.cpp | 148 +--- .../d_a_obj_magLiftRot/d_a_obj_magLiftRot.cpp | 116 +--- .../d_a_obj_magne_arm/d_a_obj_magne_arm.cpp | 346 ++-------- rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.cpp | 133 +--- .../d_a_obj_master_sword.cpp | 96 +-- rel/d/a/obj/d_a_obj_mato/d_a_obj_mato.cpp | 185 +---- .../obj/d_a_obj_metalbox/d_a_obj_metalbox.cpp | 155 +---- rel/d/a/obj/d_a_obj_mhole/d_a_obj_mhole.cpp | 162 +---- rel/d/a/obj/d_a_obj_mie/d_a_obj_mie.cpp | 201 +----- .../a/obj/d_a_obj_movebox/d_a_obj_movebox.cpp | 36 +- rel/d/a/obj/d_a_obj_msima/d_a_obj_msima.cpp | 202 +----- .../a/obj/d_a_obj_mvstair/d_a_obj_mvstair.cpp | 226 ++---- .../a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.cpp | 230 +------ .../d_a_obj_nameplate/d_a_obj_nameplate.cpp | 120 +--- rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.cpp | 306 ++------- rel/d/a/obj/d_a_obj_ndoor/d_a_obj_ndoor.cpp | 92 +-- rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu.cpp | 226 ++---- .../obj/d_a_obj_octhashi/d_a_obj_octhashi.cpp | 172 +---- .../d_a_obj_onsenTaru/d_a_obj_onsenTaru.cpp | 268 ++------ .../d_a_obj_ornament_cloth.cpp | 143 +--- rel/d/a/obj/d_a_obj_pdoor/d_a_obj_pdoor.cpp | 150 +--- rel/d/a/obj/d_a_obj_pdtile/d_a_obj_pdtile.cpp | 162 +---- rel/d/a/obj/d_a_obj_pdwall/d_a_obj_pdwall.cpp | 158 +---- .../a/obj/d_a_obj_picture/d_a_obj_picture.cpp | 268 +------- rel/d/a/obj/d_a_obj_pillar/d_a_obj_pillar.cpp | 150 +--- .../obj/d_a_obj_poCandle/d_a_obj_poCandle.cpp | 190 +----- rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.cpp | 209 +----- rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.cpp | 203 +----- .../a/obj/d_a_obj_pumpkin/d_a_obj_pumpkin.cpp | 214 +----- rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.cpp | 170 +---- .../d_a_obj_riverrock/d_a_obj_riverrock.cpp | 178 +---- rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.cpp | 8 +- .../d_a_obj_rope_bridge.cpp | 175 +---- .../d_a_obj_rotBridge/d_a_obj_rotBridge.cpp | 193 +----- .../a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap.cpp | 240 ++----- rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.cpp | 151 +---- rel/d/a/obj/d_a_obj_rstair/d_a_obj_rstair.cpp | 210 +----- rel/d/a/obj/d_a_obj_rw/d_a_obj_rw.cpp | 137 +--- .../d_a_obj_sWallShutter.cpp | 169 +---- .../a/obj/d_a_obj_sakuita/d_a_obj_sakuita.cpp | 140 +--- .../d_a_obj_sakuita_rope.cpp | 160 +---- .../a/obj/d_a_obj_scannon/d_a_obj_scannon.cpp | 308 +-------- .../d_a_obj_scannon_crs.cpp | 265 +------- .../d_a_obj_scannon_ten.cpp | 270 +------- .../obj/d_a_obj_sekidoor/d_a_obj_sekidoor.cpp | 159 +---- rel/d/a/obj/d_a_obj_shield/d_a_obj_shield.cpp | 190 +----- .../a/obj/d_a_obj_sm_door/d_a_obj_sm_door.cpp | 181 +---- .../obj/d_a_obj_smallkey/d_a_obj_smallkey.cpp | 12 +- .../a/obj/d_a_obj_smgdoor/d_a_obj_smgdoor.cpp | 177 +---- rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.cpp | 174 +---- .../d_a_obj_smw_stone/d_a_obj_smw_stone.cpp | 178 +---- .../d_a_obj_snow_soup/d_a_obj_snow_soup.cpp | 8 +- rel/d/a/obj/d_a_obj_so/d_a_obj_so.cpp | 218 +----- .../obj/d_a_obj_spinLift/d_a_obj_spinLift.cpp | 162 +---- .../obj/d_a_obj_ss_drink/d_a_obj_ss_drink.cpp | 303 ++------- .../d_a_obj_stairBlock/d_a_obj_stairBlock.cpp | 196 ++---- rel/d/a/obj/d_a_obj_stick/d_a_obj_stick.cpp | 208 +----- .../a/obj/d_a_obj_stopper/d_a_obj_stopper.cpp | 202 ++---- .../obj/d_a_obj_stopper2/d_a_obj_stopper2.cpp | 71 +- rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.cpp | 112 +-- .../a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp | 45 +- .../a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp | 53 +- .../a/obj/d_a_obj_swLight/d_a_obj_swLight.cpp | 169 +---- .../a/obj/d_a_obj_swchain/d_a_obj_swchain.cpp | 182 +---- rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.cpp | 45 +- rel/d/a/obj/d_a_obj_sword/d_a_obj_sword.cpp | 185 +---- .../d_a_obj_swpropeller.cpp | 8 +- rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.cpp | 235 +------ .../a/obj/d_a_obj_swpush2/d_a_obj_swpush2.cpp | 234 +------ .../a/obj/d_a_obj_swpush5/d_a_obj_swpush5.cpp | 198 +----- rel/d/a/obj/d_a_obj_swturn/d_a_obj_swturn.cpp | 152 +---- rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock.cpp | 326 ++------- .../obj/d_a_obj_szbridge/d_a_obj_szbridge.cpp | 158 +---- .../a/obj/d_a_obj_taFence/d_a_obj_taFence.cpp | 237 ++----- .../d_a_obj_takaraDai/d_a_obj_takaraDai.cpp | 156 +---- rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.cpp | 107 +-- rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.cpp | 265 +------- .../obj/d_a_obj_testcube/d_a_obj_testcube.cpp | 44 +- rel/d/a/obj/d_a_obj_thashi/d_a_obj_thashi.cpp | 163 +---- rel/d/a/obj/d_a_obj_thdoor/d_a_obj_thdoor.cpp | 168 +---- .../obj/d_a_obj_timeFire/d_a_obj_timeFire.cpp | 117 +--- rel/d/a/obj/d_a_obj_timer/d_a_obj_timer.cpp | 88 +-- rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.cpp | 481 +++---------- .../d_a_obj_toaru_maki/d_a_obj_toaru_maki.cpp | 54 +- rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.cpp | 200 +----- .../d_a_obj_tobyhouse/d_a_obj_tobyhouse.cpp | 240 +------ .../obj/d_a_obj_togeTrap/d_a_obj_togeTrap.cpp | 251 ++----- rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.cpp | 276 +------- .../a/obj/d_a_obj_tornado/d_a_obj_tornado.cpp | 37 +- rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.cpp | 188 +---- rel/d/a/obj/d_a_obj_treesh/d_a_obj_treesh.cpp | 142 +--- rel/d/a/obj/d_a_obj_twGate/d_a_obj_twGate.cpp | 169 +---- rel/d/a/obj/d_a_obj_udoor/d_a_obj_udoor.cpp | 115 +--- .../obj/d_a_obj_volcball/d_a_obj_volcball.cpp | 180 +---- .../a/obj/d_a_obj_volcbom/d_a_obj_volcbom.cpp | 307 +-------- .../d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.cpp | 276 +------- .../d_a_obj_warp_obrg/d_a_obj_warp_obrg.cpp | 252 +------ .../d_a_obj_waterGate/d_a_obj_waterGate.cpp | 147 +--- .../d_a_obj_waterPillar.cpp | 328 ++------- .../d_a_obj_waterfall/d_a_obj_waterfall.cpp | 89 +-- rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.cpp | 45 +- .../a/obj/d_a_obj_wdStick/d_a_obj_wdStick.cpp | 307 ++------- .../d_a_obj_wood_pendulum.cpp | 60 +- .../d_a_obj_wood_statue.cpp | 238 ++----- .../a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag.cpp | 270 ++------ rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.cpp | 246 +------ rel/d/a/obj/d_a_obj_zdoor/d_a_obj_zdoor.cpp | 62 +- .../a/obj/d_a_obj_zraMark/d_a_obj_zraMark.cpp | 129 +--- .../d_a_tag_attack_item.cpp | 2 +- tools/add_class_comments.py | 51 ++ tools/setup_actor.py | 203 +++++- 634 files changed, 17956 insertions(+), 37461 deletions(-) create mode 100644 tools/add_class_comments.py diff --git a/Progress.md b/Progress.md index 5268ac3d3f6..8b1c1ed3c63 100644 --- a/Progress.md +++ b/Progress.md @@ -21,8 +21,8 @@ Total | 54.954197% | 2209528 | 4020672 Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- main.dol | 54.954197% | 2209528 | 4020672 -RELs | 38.787290% | 4460664 | 11500324 -Total | 42.975283% | 6670192 | 15520996 +RELs | 38.789690% | 4460940 | 11500324 +Total | 42.977062% | 6670468 | 15520996 ## RELs @@ -378,7 +378,7 @@ d_a_obj_chandelier | 100.000000% | 5504 | 5504 d_a_obj_chest | 100.000000% | 7220 | 7220 d_a_obj_cho | 100.000000% | 13220 | 13220 d_a_obj_cowdoor | 100.000000% | 2188 | 2188 -d_a_obj_crope | 26.014689% | 2692 | 10348 +d_a_obj_crope | 28.681871% | 2968 | 10348 d_a_obj_crvfence | 37.146893% | 3156 | 8496 d_a_obj_crvgate | 27.603513% | 4400 | 15940 d_a_obj_crvhahen | 37.120623% | 1908 | 5140 @@ -785,4 +785,4 @@ d_a_vrbox2 | 44.907111% | 2804 | 6244 d_a_warp_bug | 100.000000% | 2024 | 2024 d_a_ykgr | 44.400631% | 2252 | 5072 f_pc_profile_lst | 100.000000% | 28156 | 28156 -Total | 38.787290% | 4460664 | 11500324 +Total | 38.789690% | 4460940 | 11500324 diff --git a/include/rel/d/a/b/d_a_b_yo/d_a_b_yo.h b/include/rel/d/a/b/d_a_b_yo/d_a_b_yo.h index 98ef985bfa5..a41e6fe5bc7 100644 --- a/include/rel/d/a/b/d_a_b_yo/d_a_b_yo.h +++ b/include/rel/d/a/b/d_a_b_yo/d_a_b_yo.h @@ -1,7 +1,6 @@ #ifndef D_A_B_YO_H #define D_A_B_YO_H -#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" /** diff --git a/include/rel/d/a/e/d_a_e_bg/d_a_e_bg.h b/include/rel/d/a/e/d_a_e_bg/d_a_e_bg.h index 97e555f175a..c8f24eb0400 100644 --- a/include/rel/d/a/e/d_a_e_bg/d_a_e_bg.h +++ b/include/rel/d/a/e/d_a_e_bg/d_a_e_bg.h @@ -1,7 +1,6 @@ #ifndef D_A_E_BG_H #define D_A_E_BG_H -#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" /** diff --git a/include/rel/d/a/e/d_a_e_bug/d_a_e_bug.h b/include/rel/d/a/e/d_a_e_bug/d_a_e_bug.h index f5d967017dd..6f273f45829 100644 --- a/include/rel/d/a/e/d_a_e_bug/d_a_e_bug.h +++ b/include/rel/d/a/e/d_a_e_bug/d_a_e_bug.h @@ -1,7 +1,6 @@ #ifndef D_A_E_BUG_H #define D_A_E_BUG_H -#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" /** diff --git a/include/rel/d/a/e/d_a_e_dk/d_a_e_dk.h b/include/rel/d/a/e/d_a_e_dk/d_a_e_dk.h index 0983f050f4a..a5a42876b1a 100644 --- a/include/rel/d/a/e/d_a_e_dk/d_a_e_dk.h +++ b/include/rel/d/a/e/d_a_e_dk/d_a_e_dk.h @@ -1,7 +1,6 @@ #ifndef D_A_E_DK_H #define D_A_E_DK_H -#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" /** diff --git a/include/rel/d/a/e/d_a_e_dt/d_a_e_dt.h b/include/rel/d/a/e/d_a_e_dt/d_a_e_dt.h index e9373ed0eb3..799df463643 100644 --- a/include/rel/d/a/e/d_a_e_dt/d_a_e_dt.h +++ b/include/rel/d/a/e/d_a_e_dt/d_a_e_dt.h @@ -1,7 +1,6 @@ #ifndef D_A_E_DT_H #define D_A_E_DT_H -#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" /** diff --git a/include/rel/d/a/e/d_a_e_fb/d_a_e_fb.h b/include/rel/d/a/e/d_a_e_fb/d_a_e_fb.h index 13fc12399be..e7a0e7ad9a3 100644 --- a/include/rel/d/a/e/d_a_e_fb/d_a_e_fb.h +++ b/include/rel/d/a/e/d_a_e_fb/d_a_e_fb.h @@ -1,7 +1,6 @@ #ifndef D_A_E_FB_H #define D_A_E_FB_H -#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" /** diff --git a/include/rel/d/a/e/d_a_e_ga/d_a_e_ga.h b/include/rel/d/a/e/d_a_e_ga/d_a_e_ga.h index 9f39409689c..9d2da2d9e9c 100644 --- a/include/rel/d/a/e/d_a_e_ga/d_a_e_ga.h +++ b/include/rel/d/a/e/d_a_e_ga/d_a_e_ga.h @@ -1,7 +1,6 @@ #ifndef D_A_E_GA_H #define D_A_E_GA_H -#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" struct ga_s { diff --git a/include/rel/d/a/e/d_a_e_gi/d_a_e_gi.h b/include/rel/d/a/e/d_a_e_gi/d_a_e_gi.h index ba7404e7e98..5321654d0db 100644 --- a/include/rel/d/a/e/d_a_e_gi/d_a_e_gi.h +++ b/include/rel/d/a/e/d_a_e_gi/d_a_e_gi.h @@ -1,7 +1,6 @@ #ifndef D_A_E_GI_H #define D_A_E_GI_H -#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" /** diff --git a/include/rel/d/a/e/d_a_e_gm/d_a_e_gm.h b/include/rel/d/a/e/d_a_e_gm/d_a_e_gm.h index 15493936615..edd1a7fc9df 100644 --- a/include/rel/d/a/e/d_a_e_gm/d_a_e_gm.h +++ b/include/rel/d/a/e/d_a_e_gm/d_a_e_gm.h @@ -1,7 +1,6 @@ #ifndef D_A_E_GM_H #define D_A_E_GM_H -#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" /** diff --git a/include/rel/d/a/e/d_a_e_gs/d_a_e_gs.h b/include/rel/d/a/e/d_a_e_gs/d_a_e_gs.h index 2f989de18ba..f6a9e82d37a 100644 --- a/include/rel/d/a/e/d_a_e_gs/d_a_e_gs.h +++ b/include/rel/d/a/e/d_a_e_gs/d_a_e_gs.h @@ -1,7 +1,6 @@ #ifndef D_A_E_GS_H #define D_A_E_GS_H -#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" /** diff --git a/include/rel/d/a/e/d_a_e_hm/d_a_e_hm.h b/include/rel/d/a/e/d_a_e_hm/d_a_e_hm.h index 9951a4be0c0..7b347033d5f 100644 --- a/include/rel/d/a/e/d_a_e_hm/d_a_e_hm.h +++ b/include/rel/d/a/e/d_a_e_hm/d_a_e_hm.h @@ -1,7 +1,6 @@ #ifndef D_A_E_HM_H #define D_A_E_HM_H -#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" /** diff --git a/include/rel/d/a/e/d_a_e_hp/d_a_e_hp.h b/include/rel/d/a/e/d_a_e_hp/d_a_e_hp.h index 11822d79b7d..36cf6be312d 100644 --- a/include/rel/d/a/e/d_a_e_hp/d_a_e_hp.h +++ b/include/rel/d/a/e/d_a_e_hp/d_a_e_hp.h @@ -1,7 +1,6 @@ #ifndef D_A_E_HP_H #define D_A_E_HP_H -#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" /** diff --git a/include/rel/d/a/e/d_a_e_kk/d_a_e_kk.h b/include/rel/d/a/e/d_a_e_kk/d_a_e_kk.h index 2256c612e3b..ca9200c53d0 100644 --- a/include/rel/d/a/e/d_a_e_kk/d_a_e_kk.h +++ b/include/rel/d/a/e/d_a_e_kk/d_a_e_kk.h @@ -1,7 +1,6 @@ #ifndef D_A_E_KK_H #define D_A_E_KK_H -#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" /** diff --git a/include/rel/d/a/e/d_a_e_oc/d_a_e_oc.h b/include/rel/d/a/e/d_a_e_oc/d_a_e_oc.h index 95f6af5e215..f791eab64f7 100644 --- a/include/rel/d/a/e/d_a_e_oc/d_a_e_oc.h +++ b/include/rel/d/a/e/d_a_e_oc/d_a_e_oc.h @@ -1,7 +1,6 @@ #ifndef D_A_E_OC_H #define D_A_E_OC_H -#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" /** diff --git a/include/rel/d/a/e/d_a_e_ot/d_a_e_ot.h b/include/rel/d/a/e/d_a_e_ot/d_a_e_ot.h index 01bd05293c9..8d2cfb33481 100644 --- a/include/rel/d/a/e/d_a_e_ot/d_a_e_ot.h +++ b/include/rel/d/a/e/d_a_e_ot/d_a_e_ot.h @@ -1,7 +1,6 @@ #ifndef D_A_E_OT_H #define D_A_E_OT_H -#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" /** diff --git a/include/rel/d/a/e/d_a_e_pz/d_a_e_pz.h b/include/rel/d/a/e/d_a_e_pz/d_a_e_pz.h index db7472e8065..6cadb83672c 100644 --- a/include/rel/d/a/e/d_a_e_pz/d_a_e_pz.h +++ b/include/rel/d/a/e/d_a_e_pz/d_a_e_pz.h @@ -1,7 +1,6 @@ #ifndef D_A_E_PZ_H #define D_A_E_PZ_H -#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" /** diff --git a/include/rel/d/a/e/d_a_e_sw/d_a_e_sw.h b/include/rel/d/a/e/d_a_e_sw/d_a_e_sw.h index 8b5f27b3ec8..d2f67ecdc7b 100644 --- a/include/rel/d/a/e/d_a_e_sw/d_a_e_sw.h +++ b/include/rel/d/a/e/d_a_e_sw/d_a_e_sw.h @@ -1,7 +1,6 @@ #ifndef D_A_E_SW_H #define D_A_E_SW_H -#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" /** diff --git a/include/rel/d/a/e/d_a_e_tt/d_a_e_tt.h b/include/rel/d/a/e/d_a_e_tt/d_a_e_tt.h index 248442315fd..0dca36acc27 100644 --- a/include/rel/d/a/e/d_a_e_tt/d_a_e_tt.h +++ b/include/rel/d/a/e/d_a_e_tt/d_a_e_tt.h @@ -1,7 +1,6 @@ #ifndef D_A_E_TT_H #define D_A_E_TT_H -#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" /** diff --git a/include/rel/d/a/e/d_a_e_vt/d_a_e_vt.h b/include/rel/d/a/e/d_a_e_vt/d_a_e_vt.h index e94b2cb4763..9c42889a8f0 100644 --- a/include/rel/d/a/e/d_a_e_vt/d_a_e_vt.h +++ b/include/rel/d/a/e/d_a_e_vt/d_a_e_vt.h @@ -146,6 +146,7 @@ class daE_VA_c : public fopEn_enemy_c { /* 807CD668 */ int create(); /* 807CDAD8 */ daE_VA_c(); +private: /* 0x005AC */ request_of_phase_process_class mPhase; /* 0x005B4 */ mDoExt_McaMorfSO* mpMorf; /* 0x005B8 */ mDoExt_McaMorfSO* mpEndEfMorf; @@ -286,6 +287,7 @@ class daE_VA_HIO_c { /* 807C25EC */ daE_VA_HIO_c(); /* 807CE2AC */ virtual ~daE_VA_HIO_c(); +private: /* 0x04 */ s8 field_0x04; /* 0x08 */ f32 mModelSize; /* 0x0C */ f32 mAttackRange; diff --git a/include/rel/d/a/e/d_a_e_warpappear/d_a_e_warpappear.h b/include/rel/d/a/e/d_a_e_warpappear/d_a_e_warpappear.h index fc18daa9363..b0499bde6b8 100644 --- a/include/rel/d/a/e/d_a_e_warpappear/d_a_e_warpappear.h +++ b/include/rel/d/a/e/d_a_e_warpappear/d_a_e_warpappear.h @@ -1,7 +1,6 @@ #ifndef D_A_E_WARPAPPEAR_H #define D_A_E_WARPAPPEAR_H -#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" /** diff --git a/include/rel/d/a/e/d_a_e_ws/d_a_e_ws.h b/include/rel/d/a/e/d_a_e_ws/d_a_e_ws.h index 6e913ca1cf0..6838ec6647b 100644 --- a/include/rel/d/a/e/d_a_e_ws/d_a_e_ws.h +++ b/include/rel/d/a/e/d_a_e_ws/d_a_e_ws.h @@ -1,7 +1,6 @@ #ifndef D_A_E_WS_H #define D_A_E_WS_H -#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" /** diff --git a/include/rel/d/a/e/d_a_e_ww/d_a_e_ww.h b/include/rel/d/a/e/d_a_e_ww/d_a_e_ww.h index 2cc915150bc..49196340379 100644 --- a/include/rel/d/a/e/d_a_e_ww/d_a_e_ww.h +++ b/include/rel/d/a/e/d_a_e_ww/d_a_e_ww.h @@ -1,7 +1,6 @@ #ifndef D_A_E_WW_H #define D_A_E_WW_H -#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" /** diff --git a/include/rel/d/a/e/d_a_e_ymb/d_a_e_ymb.h b/include/rel/d/a/e/d_a_e_ymb/d_a_e_ymb.h index 0031807651b..6c640281ba3 100644 --- a/include/rel/d/a/e/d_a_e_ymb/d_a_e_ymb.h +++ b/include/rel/d/a/e/d_a_e_ymb/d_a_e_ymb.h @@ -1,7 +1,6 @@ #ifndef D_A_E_YMB_H #define D_A_E_YMB_H -#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" /** diff --git a/include/rel/d/a/e/d_a_e_zh/d_a_e_zh.h b/include/rel/d/a/e/d_a_e_zh/d_a_e_zh.h index 3845844fbb9..1f10a671347 100644 --- a/include/rel/d/a/e/d_a_e_zh/d_a_e_zh.h +++ b/include/rel/d/a/e/d_a_e_zh/d_a_e_zh.h @@ -1,7 +1,6 @@ #ifndef D_A_E_ZH_H #define D_A_E_ZH_H -#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" /** diff --git a/include/rel/d/a/e/d_a_e_zm/d_a_e_zm.h b/include/rel/d/a/e/d_a_e_zm/d_a_e_zm.h index d27b70acd3b..42932f59e65 100644 --- a/include/rel/d/a/e/d_a_e_zm/d_a_e_zm.h +++ b/include/rel/d/a/e/d_a_e_zm/d_a_e_zm.h @@ -1,7 +1,6 @@ #ifndef D_A_E_ZM_H #define D_A_E_ZM_H -#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" /** diff --git a/include/rel/d/a/e/d_a_e_zs/d_a_e_zs.h b/include/rel/d/a/e/d_a_e_zs/d_a_e_zs.h index c8b12e19f08..99c7be15852 100644 --- a/include/rel/d/a/e/d_a_e_zs/d_a_e_zs.h +++ b/include/rel/d/a/e/d_a_e_zs/d_a_e_zs.h @@ -1,7 +1,6 @@ #ifndef D_A_E_ZS_H #define D_A_E_ZS_H -#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" /** diff --git a/include/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.h b/include/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.h index 4c5c2f6621d..7fd0dd06f1c 100644 --- a/include/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.h +++ b/include/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.h @@ -1,10 +1,21 @@ #ifndef D_A_OBJ_LV5KEY_H #define D_A_OBJ_LV5KEY_H -#include "dolphin/types.h" -#include "f_op/f_op_actor.h" +#include "f_op/f_op_actor_mng.h" -struct daObjLv5Key_c : public fopAc_ac_c { + + + +/** + * @ingroup actors-objects + * @class daObjLv5Key_c + * @brief Snowpeak Ruins Key + * + * @details + * + */ +class daObjLv5Key_c : public fopAc_ac_c { +public: /* 80B9B9B8 */ void CreateHeap(); /* 80B9BA94 */ void Init(); /* 80B9BB5C */ void setBgc(); @@ -29,8 +40,12 @@ struct daObjLv5Key_c : public fopAc_ac_c { void keylock_shake_start() { setStatus(1); } bool is_open() { return mStatus == 3; } +private: /* 0x568 */ u8 field_0x568[0x945 - 0x568]; /* 0x945 */ s8 mStatus; + /* 0x946 */ u8 field_0x946[0x97c - 0x946]; }; +STATIC_ASSERT(sizeof(daObjLv5Key_c) == 0x97c); + #endif /* D_A_OBJ_LV5KEY_H */ diff --git a/include/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara.h b/include/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara.h index e9a108206b9..5488d155726 100644 --- a/include/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara.h +++ b/include/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara.h @@ -1,6 +1,52 @@ #ifndef D_A_OBJ_TURARA_H #define D_A_OBJ_TURARA_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daTurara_c + * @brief Icicle + * + * @details + * + */ +class daTurara_c : public fopAc_ac_c { +public: + /* 80B9CC9C */ void setBaseMtx(); + /* 80B9CD74 */ void CreateHeap(); + /* 80B9CED8 */ void create(); + /* 80B9D468 */ void setFallStat(); + /* 80B9D4CC */ void Execute(f32 (**)[3][4]); + /* 80B9D548 */ void move(); + /* 80B9D72C */ void init_modeWait(); + /* 80B9D738 */ void modeWait(); + /* 80B9D998 */ void eventStart(); + /* 80B9D9BC */ void init_modeDropInit(); + /* 80B9DA00 */ void modeDropInit(); + /* 80B9DA44 */ void init_modeDrop(); + /* 80B9DB44 */ void modeDrop(); + /* 80B9DB90 */ void bgCheck(); + /* 80B9DBD0 */ void init_modeDropEnd(); + /* 80B9DE48 */ void modeDropEnd(); + /* 80B9E078 */ void init_modeDropEnd2(); + /* 80B9E338 */ void modeDropEnd2(); + /* 80B9E388 */ void Draw(); + /* 80B9E478 */ void Delete(); + /* 80B9E710 */ ~daTurara_c(); + + static u8 const mCcDObjInfo[48]; + static u8 mCcDCyl[68]; + +private: + /* 0x568 */ u8 field_0x568[0x998 - 0x568]; +}; +STATIC_ASSERT(sizeof(daTurara_c) == 0x998); + +class daTurara_HIO_c { +public: + /* 80B9CB8C */ daTurara_HIO_c(); + /* 80B9E5B4 */ ~daTurara_HIO_c(); +}; #endif /* D_A_OBJ_TURARA_H */ diff --git a/include/rel/d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst.h b/include/rel/d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst.h index e9a4f0ad36d..d087b4bb627 100644 --- a/include/rel/d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst.h +++ b/include/rel/d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst.h @@ -1,6 +1,43 @@ #ifndef D_A_OBJ_TVCDLST_H #define D_A_OBJ_TVCDLST_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daTvCdlst_c + * @brief Ordon Torch Stand + * + * @details + * + */ +class daTvCdlst_c : public fopAc_ac_c { +public: + /* 80B9ED40 */ void setBaseMtx(); + /* 80B9EDC8 */ void CreateHeap(); + /* 80B9EE34 */ void create(); + /* 80B9F144 */ void createHeapCallBack(fopAc_ac_c*); + /* 80B9F164 */ void lightInit(); + /* 80B9F1F0 */ void setLight(); + /* 80B9F220 */ void cutLight(); + /* 80B9F250 */ void pointLightProc(); + /* 80B9F300 */ void Execute(); + /* 80B9F634 */ void Draw(); + /* 80B9F6D8 */ void Delete(); + + static u8 const mCcDObjInfo[48]; + static u8 mCcDCyl[68]; + +private: + /* 0x568 */ u8 field_0x568[0x754 - 0x568]; +}; +STATIC_ASSERT(sizeof(daTvCdlst_c) == 0x754); + +class daTvCdlst_HIO_c { +public: + /* 80B9ECCC */ daTvCdlst_HIO_c(); + /* 80B9F7B0 */ ~daTvCdlst_HIO_c(); +}; + #endif /* D_A_OBJ_TVCDLST_H */ diff --git a/include/rel/d/a/obj/d_a_obj_Y_taihou/d_a_obj_Y_taihou.h b/include/rel/d/a/obj/d_a_obj_Y_taihou/d_a_obj_Y_taihou.h index 8545ca66533..61fca42588b 100644 --- a/include/rel/d/a/obj/d_a_obj_Y_taihou/d_a_obj_Y_taihou.h +++ b/include/rel/d/a/obj/d_a_obj_Y_taihou/d_a_obj_Y_taihou.h @@ -1,5 +1,40 @@ #ifndef D_A_OBJ_Y_TAIHOU_H #define D_A_OBJ_Y_TAIHOU_H +#include "f_op/f_op_actor_mng.h" +#include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h" + +/** + * @ingroup actors-objects + * @class daObjYtaihou_c + * @brief Snowpeak Ruins Cannon + * + * @details + * + */ +class daObjYtaihou_c : public fopAc_ac_c { +public: + /* 80B9FDE8 */ void create1st(); + /* 80B9FEB0 */ void setIronBall(daObjCarry_c*); + /* 80B9FF08 */ void getEvent(u8); + /* 80B9FF1C */ void loadAngle(); + /* 80B9FFAC */ void saveAngle(); + /* 80BA0060 */ void setNextAngle(); + /* 80BA0084 */ void setMtx(); + /* 80BA0208 */ void rotateCheck(); + /* 80BA045C */ void shotCheck(); + /* 80BA0964 */ void eventStart(); + /* 80BA0974 */ void CreateHeap(); + /* 80BA09E4 */ void Create(); + /* 80BA0A94 */ void Execute(f32 (**)[3][4]); + /* 80BA0B4C */ void Draw(); + /* 80BA0C1C */ void Delete(); + /* 80BA0FA4 */ ~daObjYtaihou_c(); + +private: + /* 0x568 */ u8 field_0x568[0x778 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjYtaihou_c) == 0x778); + #endif /* D_A_OBJ_Y_TAIHOU_H */ diff --git a/include/rel/d/a/obj/d_a_obj_amiShutter/d_a_obj_amiShutter.h b/include/rel/d/a/obj/d_a_obj_amiShutter/d_a_obj_amiShutter.h index c75f54882c7..285911d6302 100644 --- a/include/rel/d/a/obj/d_a_obj_amiShutter/d_a_obj_amiShutter.h +++ b/include/rel/d/a/obj/d_a_obj_amiShutter/d_a_obj_amiShutter.h @@ -1,6 +1,48 @@ #ifndef D_A_OBJ_AMISHUTTER_H #define D_A_OBJ_AMISHUTTER_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daAmiShutter_c + * @brief Drain Gate + * + * @details + * + */ +class daAmiShutter_c : public fopAc_ac_c { + /* 80BA155C */ void setBaseMtx(); + /* 80BA15E4 */ void CreateHeap(); + /* 80BA1650 */ void create(); + /* 80BA182C */ void Execute(f32 (**)[3][4]); + /* 80BA1888 */ void moveShutter(); + /* 80BA1974 */ void playerAreaCheck(); + /* 80BA1B4C */ void init_modeWait(); + /* 80BA1B58 */ void modeWait(); + /* 80BA1BCC */ void init_modeWaitEvent(); + /* 80BA1BD8 */ void modeWaitEvent(); + /* 80BA1C90 */ void eventStart(); + /* 80BA1CB4 */ void init_modeClose(); + /* 80BA1D48 */ void modeClose(); + /* 80BA1DCC */ void init_modeCloseEvent(); + /* 80BA1E60 */ void modeCloseEvent(); + /* 80BA1EEC */ void init_modeCloseEnd(); + /* 80BA1F7C */ void modeCloseEnd(); + /* 80BA1F80 */ void init_modeOpen(); + /* 80BA2004 */ void modeOpen(); + /* 80BA2080 */ void Draw(); + /* 80BA2124 */ void Delete(); + /* 80BA22E8 */ ~daAmiShutter_c(); +private: + /* 0x568 */ u8 field_0x568[0x5dc - 0x568]; +}; +STATIC_ASSERT(sizeof(daAmiShutter_c) == 0x5dc); + +class daAmiShutter_HIO_c { + /* 80BA14CC */ daAmiShutter_HIO_c(); + /* 80BA21E0 */ ~daAmiShutter_HIO_c(); +}; + #endif /* D_A_OBJ_AMISHUTTER_H */ diff --git a/include/rel/d/a/obj/d_a_obj_ari/d_a_obj_ari.h b/include/rel/d/a/obj/d_a_obj_ari/d_a_obj_ari.h index 51e3884baf1..88c4c4a74ec 100644 --- a/include/rel/d/a/obj/d_a_obj_ari/d_a_obj_ari.h +++ b/include/rel/d/a/obj/d_a_obj_ari/d_a_obj_ari.h @@ -8,6 +8,14 @@ #include "d/a/d_a_player.h" #include "d/d_insect.h" +/** + * @ingroup actors-objects + * @class daObjARI_c + * @brief Insect - Ant + * + * @details + * + */ class daObjARI_c : public dInsect_c { public: /* 80BA26BC */ void InitCcSph(); @@ -32,6 +40,7 @@ class daObjARI_c : public dInsect_c { /* 80BA483C */ bool CreateChk(); /* 80BA49E8 */ cPhs__Step create(); +private: /* 0x590 */ dBgS_GndChk mGndChk; /* 0x5E4 */ u8 field_0x5e4[4]; /* 0x5E8 */ u8 mAction; diff --git a/include/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.h b/include/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.h index 86771a2945d..afd14957358 100644 --- a/include/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.h +++ b/include/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.h @@ -1,5 +1,43 @@ #ifndef D_A_OBJ_AUTOMATA_H #define D_A_OBJ_AUTOMATA_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObj_AutoMata_c + * @brief Falbi's Music Box + * + * @details + * + */ +class daObj_AutoMata_c : public fopAc_ac_c { +public: + /* 80BA56EC */ ~daObj_AutoMata_c(); + /* 80BA5990 */ void create(); + /* 80BA5F88 */ void CreateHeap(); + /* 80BA60A0 */ void Delete(); + /* 80BA60D4 */ void Execute(); + /* 80BA639C */ void Draw(); + /* 80BA6480 */ void createHeapCallBack(fopAc_ac_c*); + /* 80BA64A0 */ void srchTHouse(fopAc_ac_c*, void*); + /* 80BA6500 */ void setAnm(int, bool); + /* 80BA6634 */ void setEnvTevColor(); + /* 80BA6690 */ void setRoomNo(); + /* 80BA66D4 */ void setMtx(); + /* 80BA674C */ void setSe(); + +private: + /* 0x568 */ u8 field_0x568[0xb38 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObj_AutoMata_c) == 0xb38); + +class daObj_AutoMata_Param_c { +public: + /* 80BA6BA4 */ ~daObj_AutoMata_Param_c(); + + static u8 const m[12]; +}; + #endif /* D_A_OBJ_AUTOMATA_H */ diff --git a/include/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.h b/include/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.h index 4d94769be73..d1d1c7446fc 100644 --- a/include/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.h +++ b/include/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.h @@ -7,6 +7,14 @@ class dBgW; +/** + * @ingroup actors-objects + * @class daObjAvalanche_c + * @brief Avalanche + * + * @details + * + */ class daObjAvalanche_c : public dBgS_MoveBgActor { public: enum Action { diff --git a/include/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon.h b/include/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon.h index 63139035590..b72e62e3a43 100644 --- a/include/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon.h +++ b/include/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon.h @@ -7,6 +7,14 @@ #include "d/cc/d_cc_d.h" #include "SSystem/SComponent/c_phase.h" +/** + * @ingroup actors-objects + * @class daObj_Balloon_c + * @brief Balloon + * + * @details + * + */ class daObj_Balloon_c : public fopAc_ac_c { public: /* 80BA7FF4 */ int draw(); diff --git a/include/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.h b/include/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.h index 077047d57af..b16eb252451 100644 --- a/include/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.h +++ b/include/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.h @@ -6,6 +6,14 @@ #include "d/bg/d_bg_s_movebg_actor.h" #include "d/cc/d_cc_d.h" +/** + * @ingroup actors-objects + * @class daBarDesk_c + * @brief Kakariko House Desk + * + * @details + * + */ class daBarDesk_c : public dBgS_MoveBgActor { public: /* 80BA9200 */ void setBaseMtx(); diff --git a/include/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.h b/include/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.h index cfb06ca694c..98c912dc948 100644 --- a/include/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.h +++ b/include/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.h @@ -1,6 +1,46 @@ #ifndef D_A_OBJ_BATTA_H #define D_A_OBJ_BATTA_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "d/d_insect.h" + +/** + * @ingroup actors-objects + * @class daObjBATTA_c + * @brief Insect - Grasshopper + * + * @details + * + */ +class daObjBATTA_c : public dInsect_c { +public: + /* 80BA9E5C */ void setAction(void (daObjBATTA_c::*)()); + /* 80BAA1C8 */ void wait(); + /* 80BAA47C */ void turn(); + /* 80BAAA18 */ void jump(); + /* 80BAAD30 */ void fly_up(); + /* 80BAB234 */ void fly_down(); + /* 80BAB500 */ void bin_wait(); + /* 80BAB6C8 */ void bin_action(); + /* 80BAB820 */ void hook(); + /* 80BAB934 */ void boomerang(); + /* 80BABA98 */ void batta_setParticle(); + /* 80BABCA4 */ void action(); + /* 80BABD6C */ void hit_check(); + /* 80BABE20 */ void execute(); + /* 80BABFA4 */ void _delete(); + /* 80BAC00C */ void mtx_set(); + /* 80BAC194 */ void create(); + +private: + /* 0x590 */ u8 field_0x568[0x9f8 - 0x590]; +}; +STATIC_ASSERT(sizeof(daObjBATTA_c) == 0x9f8); + +class daObj_BattaHIO_c { +public: + /* 80BA9E2C */ daObj_BattaHIO_c(); + /* 80BAC874 */ ~daObj_BattaHIO_c(); +}; #endif /* D_A_OBJ_BATTA_H */ diff --git a/include/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.h b/include/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.h index 67a9d12b0a6..7657dbe583d 100644 --- a/include/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.h +++ b/include/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.h @@ -5,6 +5,14 @@ #include "d/cc/d_cc_d.h" #include "f_op/f_op_actor_mng.h" +/** + * @ingroup actors-objects + * @class daObjBBox_c + * @brief B Box + * + * @details + * + */ class daObjBBox_c : public dBgS_MoveBgActor { public: /* 80BACD38 */ void initBaseMtx(); @@ -23,6 +31,7 @@ class daObjBBox_c : public dBgS_MoveBgActor { /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ dCcD_Stts mStts; /* 0x5E8 */ dCcD_Cyl mCyl; -}; // Size: 0x724 +}; +STATIC_ASSERT(sizeof(daObjBBox_c) == 0x724); #endif /* D_A_OBJ_BBOX_H */ diff --git a/include/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.h b/include/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.h index 14a2876b7c4..95fbca663ed 100644 --- a/include/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.h +++ b/include/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.h @@ -8,6 +8,14 @@ class dBgW; +/** + * @ingroup actors-objects + * @class daObj_Bed_c + * @brief Bed + * + * @details + * + */ class daObj_Bed_c : public fopAc_ac_c { public: /* 0x568 */ u8 field_0x568[4]; diff --git a/include/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.h b/include/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.h index cb2fabd9e91..2389ef51d97 100644 --- a/include/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.h +++ b/include/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.h @@ -1,5 +1,85 @@ #ifndef D_A_OBJ_BEMOS_H #define D_A_OBJ_BEMOS_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjBm_c + * @brief Beamos (Movable Object) + * + * @details + * + */ +class daObjBm_c : public fopAc_ac_c { +public: + class BgcSrc_c {}; + + class Bgc_c { + public: + /* 80BB0E0C */ Bgc_c(); + /* 80BB0ED4 */ void wall_pos(fopAc_ac_c const*, daObjBm_c::BgcSrc_c const*, int, s16, f32); + /* 80BB1154 */ void chk_wall_pre(fopAc_ac_c const*, daObjBm_c::BgcSrc_c const*, int, s16); + + static u8 const M_lin20[368]; + static u8 M_lin5[80]; + static u8 M_gnd_work[1932]; + static u8 M_wrt_work[84]; + static u8 M_wall_work[2576]; + }; + + /* 80BAE36C */ void PPCallBack(fopAc_ac_c*, fopAc_ac_c*, s16, dBgW_Base::PushPullLabel); + /* 80BAE5FC */ void initBaseMtx(); + /* 80BAE68C */ void setBaseMtx(); + /* 80BAE778 */ int Create(); + /* 80BAEADC */ int CreateHeap(); + /* 80BAEFD8 */ void create1st(); + /* 80BAF09C */ int Execute(f32 (**)[3][4]); + /* 80BAF29C */ void main_proc_call(); + /* 80BAF328 */ void initActionEnBemos(); + /* 80BAF37C */ void initActionObjBemos(); + /* 80BAF46C */ void actionEnBemos(); + /* 80BAF750 */ void actionObjBemos(); + /* 80BAF80C */ void setCrawCO(); + /* 80BAF8F8 */ void calcBeamPos(); + /* 80BAFC08 */ void calcBeamLenAndAt(); + /* 80BAFFA8 */ void checkFindPlayer(); + /* 80BB0104 */ void checkSearchPlayer(); + /* 80BB0260 */ void getSearchDistance(); + /* 80BB02B8 */ void getBeamSearchDistance(); + /* 80BB0310 */ void effect_proc(); + /* 80BB0580 */ void effectWait(); + /* 80BB0584 */ void initEffectSet0(); + /* 80BB0718 */ void effectSet0(); + /* 80BB071C */ void effectSet1(); + /* 80BB0720 */ void effectEnd(); + /* 80BB0724 */ void check_to_walk(); + /* 80BB0824 */ void mode_wait_init(); + /* 80BB0888 */ void mode_wait(); + /* 80BB09C8 */ void mode_walk_init(); + /* 80BB09E0 */ void mode_walk(); + /* 80BB0DA8 */ void mode_afl(); + /* 80BB0DC0 */ void mode_dead_init(); + /* 80BB0DE4 */ void mode_dead(); + /* 80BB0DE8 */ void clr_moment_cnt(); + /* 80BB1194 */ void initActionSwWait(); + /* 80BB11D4 */ void actionSwWait(); + /* 80BB14C8 */ void initActionWarning(); + /* 80BB154C */ void actionWarning(); + /* 80BB1654 */ void initActionFindPlayer(); + /* 80BB1814 */ void actionFindPlayer(); + /* 80BB1960 */ void initActionAttack(); + /* 80BB1BD0 */ void actionAttack(); + /* 80BB248C */ void initActionDead(); + /* 80BB2700 */ void actionDead(); + /* 80BB2AB0 */ int Draw(); + /* 80BB2C8C */ int Delete(); + + static u8 const M_dir_base[8]; +private: + /* 0x568 */ u8 field_0x568[0x1258 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjBm_c) == 0x1258); + #endif /* D_A_OBJ_BEMOS_H */ diff --git a/include/rel/d/a/obj/d_a_obj_bhashi/d_a_obj_bhashi.h b/include/rel/d/a/obj/d_a_obj_bhashi/d_a_obj_bhashi.h index 350bf297a3b..e335ce36a64 100644 --- a/include/rel/d/a/obj/d_a_obj_bhashi/d_a_obj_bhashi.h +++ b/include/rel/d/a/obj/d_a_obj_bhashi/d_a_obj_bhashi.h @@ -1,5 +1,48 @@ #ifndef D_A_OBJ_BHASHI_H #define D_A_OBJ_BHASHI_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjBHASHI_c + * @brief Morpheel Room Pillar? + * + * @details + * + */ +class daObjBHASHI_c : public fopAc_ac_c { +public: + /* 80576A58 */ void initCcCylinder(); + /* 80576AC4 */ void setCcCylinder(); + /* 80576B78 */ void Set_Hahen(); + /* 80576C50 */ void Set_Speed(s16, s16, f32, f32); + /* 80577500 */ void Obj_Damage(cXyz); + /* 805771EC */ void Obj_Damage(); + /* 80577E24 */ void Rolling(cXyz*, f32, f32); + /* 805781FC */ void setBaseMtx(); + /* 80578330 */ void CreateHeap(); + /* 8057842C */ void create(); + /* 80578788 */ void Create(); + /* 805787CC */ void Execute(f32 (**)[3][4]); + /* 805788EC */ void Draw(); + /* 805789E8 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x1464 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjBHASHI_c) == 0x1464); + +class Hahen_c { +public: + /* 80577794 */ Hahen_c(); + /* 805777A4 */ void Wall_Check(); + /* 80577868 */ void HahenMotion(); + /* 80577C1C */ void CheckCull(); + /* 80577DA4 */ void checkViewArea(); + /* 80577FE0 */ void Roll_Set(cXyz*, f32, s16); + /* 80578744 */ ~Hahen_c(); +}; + #endif /* D_A_OBJ_BHASHI_H */ diff --git a/include/rel/d/a/obj/d_a_obj_bhbridge/d_a_obj_bhbridge.h b/include/rel/d/a/obj/d_a_obj_bhbridge/d_a_obj_bhbridge.h index 52971f6505f..be1fcd19b9a 100644 --- a/include/rel/d/a/obj/d_a_obj_bhbridge/d_a_obj_bhbridge.h +++ b/include/rel/d/a/obj/d_a_obj_bhbridge/d_a_obj_bhbridge.h @@ -1,6 +1,32 @@ #ifndef D_A_OBJ_BHBRIDGE_H #define D_A_OBJ_BHBRIDGE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjBhbridge_c + * @brief BH Bridge? + * + * @details + * + */ +class daObjBhbridge_c : public fopAc_ac_c { +public: + /* 80BB5318 */ void RideOn_Angle(s16&, f32, s16, f32); + /* 80BB5380 */ void Check_RideOn(); + /* 80BB558C */ void initBaseMtx(); + /* 80BB55B8 */ void setBaseMtx(); + /* 80BB5934 */ void CreateHeap(); + /* 80BB59AC */ void Create(); + /* 80BB5A14 */ void Execute(f32 (**)[3][4]); + /* 80BB5E10 */ void Draw(); + /* 80BB5EB4 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x810 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjBhbridge_c) == 0x810); + #endif /* D_A_OBJ_BHBRIDGE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.h b/include/rel/d/a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.h index bc10c615336..ce0ee8f3dd8 100644 --- a/include/rel/d/a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.h +++ b/include/rel/d/a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.h @@ -3,6 +3,14 @@ #include "f_op/f_op_actor_mng.h" +/** + * @ingroup actors-objects + * @class daBkLeaf_c + * @brief Baba Stem Leaf + * + * @details + * + */ class daBkLeaf_c : public fopAc_ac_c { public: /* 80BB60F8 */ void setBokkuri(); diff --git a/include/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.h b/include/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.h index 037c9326433..9c187600898 100644 --- a/include/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.h +++ b/include/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.h @@ -6,6 +6,14 @@ class J3DModel; +/** + * @ingroup actors-objects + * @class daObjBkDoor_c + * @brief Ranch Door + * + * @details + * + */ class daObjBkDoor_c : public dBgS_MoveBgActor { public: /* 80578D4C */ void initBaseMtx(); diff --git a/include/rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock.h b/include/rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock.h index b341704b663..8440a726fb0 100644 --- a/include/rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock.h +++ b/include/rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock.h @@ -1,6 +1,50 @@ #ifndef D_A_OBJ_BKY_ROCK_H #define D_A_OBJ_BKY_ROCK_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daBkyRock_c + * @brief Bomb Shack Rock + * + * @details + * + */ +class daBkyRock_c : public fopAc_ac_c { +public: + struct _pieceData { + public: + /* 80BB6914 */ _pieceData(); + }; + + /* 80BB6858 */ daBkyRock_c(); + /* 80BB6B5C */ ~daBkyRock_c(); + /* 80BB6C4C */ void create(); + /* 80BB6D60 */ void execute(); + /* 80BB6D84 */ void draw(); + /* 80BB6EB8 */ void Delete(); + /* 80BB6F64 */ void setModelMtx(); + /* 80BB6FD4 */ void createHeap(); + /* 80BB7144 */ void init(); + /* 80BB72FC */ void middleExe(); + /* 80BB7364 */ void exeModeNoDamage(); + /* 80BB7458 */ void exeModeDamage(); + /* 80BB75D8 */ void exeModePiece(); + /* 80BB7690 */ void chkHitBombArrow(); + /* 80BB776C */ void initChangeModeBefore(); + /* 80BB77FC */ void initChangeModeAfter(); + /* 80BB7818 */ void pieceMove(); + /* 80BB7988 */ void pieceMoveInit(); + /* 80BB7C18 */ void callBombEmt(int, u16 const*); + + static u8 const s_CcDCyl[68]; + static u8 s_exeProc[36]; + +private: + /* 0x568 */ u8 field_0x568[0xf50 - 0x568]; +}; +STATIC_ASSERT(sizeof(daBkyRock_c) == 0xf50); + #endif /* D_A_OBJ_BKY_ROCK_H */ diff --git a/include/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.h b/include/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.h index 32c68956ff3..c6a216dff4c 100644 --- a/include/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.h +++ b/include/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.h @@ -6,6 +6,14 @@ #include "d/cc/d_cc_d.h" #include "f_op/f_op_actor_mng.h" +/** + * @ingroup actors-objects + * @class daBmWindow_c + * @brief Boomerang Window? + * + * @details + * + */ class daBmWindow_c : public dBgS_MoveBgActor { public: @@ -31,6 +39,7 @@ class daBmWindow_c : public dBgS_MoveBgActor /* 80BB9494 */ int Draw(); /* 80BB9548 */ int Delete(); +private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mModel; /* 0x5AC */ u8 mMode; @@ -60,6 +69,7 @@ class daBmWindow_c : public dBgS_MoveBgActor static dCcD_SrcGObjInf const mCcDObjInfo; static dCcD_SrcCyl mCcDCyl; }; +STATIC_ASSERT(sizeof(daBmWindow_c) == 0xEE0); class daBmWindow_HIO_c : public fOpAcm_HIO_entry_c { public: diff --git a/include/rel/d/a/obj/d_a_obj_bmshutter/d_a_obj_bmshutter.h b/include/rel/d/a/obj/d_a_obj_bmshutter/d_a_obj_bmshutter.h index d856cb6608b..5066dfe9c85 100644 --- a/include/rel/d/a/obj/d_a_obj_bmshutter/d_a_obj_bmshutter.h +++ b/include/rel/d/a/obj/d_a_obj_bmshutter/d_a_obj_bmshutter.h @@ -1,6 +1,43 @@ #ifndef D_A_OBJ_BMSHUTTER_H #define D_A_OBJ_BMSHUTTER_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjBmSh_c + * @brief Boomerang Shutter + * + * @details + * + */ +class daObjBmSh_c : public fopAc_ac_c { +public: + /* 80BB9A58 */ void initBaseMtx(); + /* 80BB9AE4 */ void setBaseMtx(); + /* 80BB9B84 */ void Create(); + /* 80BB9C50 */ void CreateHeap(); + /* 80BB9CC0 */ void create(); + /* 80BB9DB4 */ void Execute(f32 (**)[3][4]); + /* 80BB9F34 */ void checkSw(); + /* 80BB9FBC */ void checkAnySw(); + /* 80BBA044 */ void checkMySw(); + /* 80BBA080 */ void event_proc_call(); + /* 80BBA13C */ void actionWait(); + /* 80BBA1A4 */ void actionOrderEvent(); + /* 80BBA20C */ void actionEvent(); + /* 80BBA268 */ void actionDead(); + /* 80BBA26C */ void mode_proc_call(); + /* 80BBA394 */ void modeWait(); + /* 80BBA5B4 */ void modeMove(); + /* 80BBA640 */ void modeEnd(); + /* 80BBA644 */ void Draw(); + /* 80BBA6E8 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x5dc - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjBmSh_c) == 0x5dc); + #endif /* D_A_OBJ_BMSHUTTER_H */ diff --git a/include/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.h b/include/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.h index cb630d6b2b3..92f7b145481 100644 --- a/include/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.h +++ b/include/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.h @@ -4,6 +4,14 @@ #include "d/com/d_com_inf_game.h" #include "d/d_bomb.h" +/** + * @ingroup actors-objects + * @class daObjBombf_c + * @brief Bomb Flower + * + * @details + * + */ class daObjBombf_c : public fopAc_ac_c { public: /* 80BBA9F8 */ bool createHeap(); @@ -13,6 +21,7 @@ class daObjBombf_c : public fopAc_ac_c { /* 80BBACC0 */ int execute(); /* 80BBADF8 */ int draw(); +private: /* 0x568 */ request_of_phase_process_class field_0x568; /* 0x570 */ J3DModel* field_0x570; /* 0x574 */ u32 field_0x574; @@ -21,6 +30,7 @@ class daObjBombf_c : public fopAc_ac_c { /* 0x580 */ u16 field_0x580; /* 0x582 */ u8 field_0x582; /* 0x584 */ f32 field_0x584; -}; // Size: 0x588 +}; +STATIC_ASSERT(sizeof(daObjBombf_c) == 0x588); #endif /* D_A_OBJ_BOMBF_H */ diff --git a/include/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.h b/include/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.h index 4b5d4fe262f..76c987118c8 100644 --- a/include/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.h +++ b/include/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.h @@ -4,6 +4,14 @@ #include "f_op/f_op_actor_mng.h" #include "d/msg/d_msg_flow.h" +/** + * @ingroup actors-objects + * @class daObjBossWarp_c + * @brief Boss Warp + * + * @details + * + */ class daObjBossWarp_c : public fopAc_ac_c { public: enum Action { @@ -52,6 +60,7 @@ class daObjBossWarp_c : public fopAc_ac_c { bool isFirst() { return fopAcM_GetParamBit(this, 0x1b, 1); } void setAction(u8 action) { mAction = action; } +private: /* 0x568 */ request_of_phase_process_class mPhaseReq; /* 0x570 */ J3DModel* mpModel; /* 0x574 */ mDoExt_btkAnm* mpBtkAnm[2]; @@ -79,7 +88,6 @@ class daObjBossWarp_c : public fopAc_ac_c { /* 0x620 */ cXyz field_0x620; /* 0x62C */ bool mScalingUp; }; - STATIC_ASSERT(sizeof(daObjBossWarp_c) == 0x630); #endif /* D_A_OBJ_BOSSWARP_H */ diff --git a/include/rel/d/a/obj/d_a_obj_boumato/d_a_obj_boumato.h b/include/rel/d/a/obj/d_a_obj_boumato/d_a_obj_boumato.h index 6911a0b973a..226e899bc38 100644 --- a/include/rel/d/a/obj/d_a_obj_boumato/d_a_obj_boumato.h +++ b/include/rel/d/a/obj/d_a_obj_boumato/d_a_obj_boumato.h @@ -1,5 +1,46 @@ #ifndef D_A_OBJ_BOUMATO_H #define D_A_OBJ_BOUMATO_H +#include "f_op/f_op_actor_mng.h" +#include "d/cc/d_cc_d.h" + +/** + * @ingroup actors-objects + * @class daObj_BouMato_c + * @brief Stick Target + * + * @details + * + */ +class daObj_BouMato_c : public fopAc_ac_c { +public: + /* 80BBAFEC */ ~daObj_BouMato_c(); + /* 80BBB230 */ void create(); + /* 80BBB770 */ void CreateHeap(); + /* 80BBB800 */ void Delete(); + /* 80BBB834 */ void Execute(); + /* 80BBBD80 */ void Draw(); + /* 80BBBE50 */ void createHeapCallBack(fopAc_ac_c*); + /* 80BBBE70 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); + /* 80BBBEA0 */ void srchArrow(void*, void*); + /* 80BBBF4C */ void deleteStuckArrow(); + /* 80BBBFF8 */ void getResName(); + /* 80BBC008 */ void setSwayParam(fopAc_ac_c*); + /* 80BBC19C */ void setEnvTevColor(); + /* 80BBC1F8 */ void setRoomNo(); + /* 80BBC23C */ void setMtx(); + +private: + /* 0x568 */ u8 field_0x568[0xa40 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObj_BouMato_c) == 0xa40); + +class daObj_BouMato_Param_c { +public: + /* 80BBC404 */ ~daObj_BouMato_Param_c(); + + static u8 const m[28]; +}; + #endif /* D_A_OBJ_BOUMATO_H */ diff --git a/include/rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.h b/include/rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.h index f7029f2e064..e304a642234 100644 --- a/include/rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.h +++ b/include/rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.h @@ -1,5 +1,21 @@ #ifndef D_A_OBJ_BRAKEEFF_H #define D_A_OBJ_BRAKEEFF_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class obj_brakeeff_class + * @brief ??? + * + * @details + * + */ +class obj_brakeeff_class : public fopAc_ac_c { +private: + /* 0x568 */ u8 field_0x568[0x73c - 0x568]; +}; +STATIC_ASSERT(sizeof(obj_brakeeff_class) == 0x73c); + #endif /* D_A_OBJ_BRAKEEFF_H */ diff --git a/include/rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.h b/include/rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.h index 6997d43c72b..324f3a8d056 100644 --- a/include/rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.h +++ b/include/rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.h @@ -1,5 +1,27 @@ #ifndef D_A_OBJ_BRG_H #define D_A_OBJ_BRG_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class obj_brg_class + * @brief Bridge + * + * @details + * + */ +class obj_brg_class : public fopAc_ac_c { +private: + /* 0x568 */ u8 field_0x568[0xb1f8 - 0x568]; +}; +STATIC_ASSERT(sizeof(obj_brg_class) == 0xb1f8); + +struct br_s { +public: + /* 80BC1F54 */ ~br_s(); + /* 80BC2000 */ br_s(); +}; + #endif /* D_A_OBJ_BRG_H */ diff --git a/include/rel/d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.h b/include/rel/d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.h index 6f9430e92b8..d5f5394d6e0 100644 --- a/include/rel/d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.h +++ b/include/rel/d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.h @@ -5,6 +5,14 @@ #include "m_Do/m_Do_hostIO.h" #include "d/bg/d_bg_s_movebg_actor.h" +/** + * @ingroup actors-objects + * @class daBsGate_c + * @brief Boss Gate + * + * @details + * + */ class daBsGate_c : public dBgS_MoveBgActor { public: enum Mode { @@ -27,6 +35,7 @@ class daBsGate_c : public dBgS_MoveBgActor { /* 80BC2F94 */ int Draw(); /* 80BC3038 */ int Delete(); +private: /* 0x5A0 */ request_of_phase_process_class mPhaseReq; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ u8 mMode; @@ -36,7 +45,6 @@ class daBsGate_c : public dBgS_MoveBgActor { /* 0x5B0 */ f32 mTargetDist; /* 0x5B4 */ f32 mOpenDist; }; - STATIC_ASSERT(sizeof(daBsGate_c) == 0x5B8); class daBsGate_HIO_c : public mDoHIO_entry_c { diff --git a/include/rel/d/a/obj/d_a_obj_bubblePilar/d_a_obj_bubblePilar.h b/include/rel/d/a/obj/d_a_obj_bubblePilar/d_a_obj_bubblePilar.h index 0de130f3f22..89b61d297e0 100644 --- a/include/rel/d/a/obj/d_a_obj_bubblePilar/d_a_obj_bubblePilar.h +++ b/include/rel/d/a/obj/d_a_obj_bubblePilar/d_a_obj_bubblePilar.h @@ -1,6 +1,42 @@ #ifndef D_A_OBJ_BUBBLEPILAR_H #define D_A_OBJ_BUBBLEPILAR_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daBubbPilar_c + * @brief Bubble Pillar + * + * @details + * + */ +class daBubbPilar_c : public fopAc_ac_c { +public: + /* 80BC3460 */ void setBaseMtx(); + /* 80BC3518 */ void CreateHeap(); + /* 80BC35D0 */ void create(); + /* 80BC3934 */ void Execute(f32 (**)[3][4]); + /* 80BC3AB8 */ void initModeWait(); + /* 80BC3AC4 */ void modeWait(); + /* 80BC3C74 */ void initModeEffOn(); + /* 80BC3C98 */ void modeEffOn(); + /* 80BC3DB0 */ void Draw(); + /* 80BC3E8C */ void Delete(); + + static u8 const mCcDObjInfo[48]; + static u8 mCcDCyl[68]; + +private: + /* 0x568 */ u8 field_0x568[0x750 - 0x568]; +}; +STATIC_ASSERT(sizeof(daBubbPilar_c) == 0x750); + +class daBubbPilar_HIO_c { +public: + /* 80BC33EC */ daBubbPilar_HIO_c(); + /* 80BC3F90 */ ~daBubbPilar_HIO_c(); +}; + #endif /* D_A_OBJ_BUBBLEPILAR_H */ diff --git a/include/rel/d/a/obj/d_a_obj_burnbox/d_a_obj_burnbox.h b/include/rel/d/a/obj/d_a_obj_burnbox/d_a_obj_burnbox.h index 1e5174ae35a..3968edac748 100644 --- a/include/rel/d/a/obj/d_a_obj_burnbox/d_a_obj_burnbox.h +++ b/include/rel/d/a/obj/d_a_obj_burnbox/d_a_obj_burnbox.h @@ -1,5 +1,31 @@ #ifndef D_A_OBJ_BURNBOX_H #define D_A_OBJ_BURNBOX_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjBurnBox_c + * @brief Burn Box + * + * @details + * + */ +class daObjBurnBox_c : public fopAc_ac_c { +public: + /* 8046E698 */ void initBaseMtx(); + /* 8046E6D4 */ void setBaseMtx(); + /* 8046E738 */ void Create(); + /* 8046E8BC */ void CreateHeap(); + /* 8046E93C */ void create1st(); + /* 8046E9EC */ void Execute(f32 (**)[3][4]); + /* 8046EABC */ void Draw(); + /* 8046EC10 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x740 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjBurnBox_c) == 0x740); + #endif /* D_A_OBJ_BURNBOX_H */ diff --git a/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h b/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h index ad61c951584..3f9b773d3e4 100644 --- a/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h +++ b/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h @@ -5,22 +5,12 @@ #include "f_op/f_op_actor_mng.h" #include "d/com/d_com_inf_game.h" -struct daObjCarry_Data { - /* 0x0000 */ u8 field_0x0000[0x0030 - 0x0000]; - /* 0x0030 */ float field_0x0030; - /* 0x0034 */ u8 field_0x0034; - /* 0x0035 */ u8 field_0x0035[0x0038 - 0x0035]; - /* 0x0038 */ float field_0x0038; - /* 0x003C */ float field_0x003c; - /* 0x0040 */ float field_0x0040; - /* 0x0044 */ u8 field_0x0044[0x94-0x44]; -}; - /** * @ingroup actors-objects + * @class daObjCarry_c * @brief Carryable Object * - * This is a multi-use class for carryable objects. + * @details This is a multi-use class for carryable objects. * It's used by: small and large blue pot, small and large red pot, box, cannon ball, barrel, skull, deku nut, Sols, small and large Twilight pots. * */ @@ -317,4 +307,15 @@ class daObjCarry_c : public fopAc_ac_c { }; STATIC_ASSERT(sizeof(daObjCarry_c) == 0xE28); +struct daObjCarry_Data { + /* 0x0000 */ u8 field_0x0000[0x0030 - 0x0000]; + /* 0x0030 */ float field_0x0030; + /* 0x0034 */ u8 field_0x0034; + /* 0x0035 */ u8 field_0x0035[0x0038 - 0x0035]; + /* 0x0038 */ float field_0x0038; + /* 0x003C */ float field_0x003c; + /* 0x0040 */ float field_0x0040; + /* 0x0044 */ u8 field_0x0044[0x94-0x44]; +}; + #endif /* D_A_OBJ_CARRY_H */ diff --git a/include/rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.h b/include/rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.h index c9c63fa43a6..d5645976dbe 100644 --- a/include/rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.h +++ b/include/rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.h @@ -4,13 +4,22 @@ #include "f_op/f_op_actor_mng.h" #include "d/bg/d_bg_w.h" -struct daObjCatDoor_Door_c { +class daObjCatDoor_Door_c { +public: /* 0x00 */ J3DModel* pmodel; /* 0x04 */ dBgW bgw; /* 0xe0 */ Mtx mtx; /* 0xf4 */ s16 angle; }; +/** + * @ingroup actors-objects + * @class daObjCatDoor_c + * @brief Cat Door + * + * @details + * + */ class daObjCatDoor_c : public fopAc_ac_c { public: inline ~daObjCatDoor_c(); diff --git a/include/rel/d/a/obj/d_a_obj_cb/d_a_obj_cb.h b/include/rel/d/a/obj/d_a_obj_cb/d_a_obj_cb.h index 5f2123db493..cb3e167e181 100644 --- a/include/rel/d/a/obj/d_a_obj_cb/d_a_obj_cb.h +++ b/include/rel/d/a/obj/d_a_obj_cb/d_a_obj_cb.h @@ -1,6 +1,27 @@ #ifndef D_A_OBJ_CB_H #define D_A_OBJ_CB_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class obj_cb_class + * @brief Castle Block? + * + * @details + * + */ +class obj_cb_class : public fopAc_ac_c { +private: + /* 0x568 */ u8 field_0x568[0x97c - 0x568]; +}; +STATIC_ASSERT(sizeof(obj_cb_class) == 0x97c); + +class daObj_Cb_HIO_c { +public: + /* 80BC4B2C */ daObj_Cb_HIO_c(); + /* 80BC573C */ ~daObj_Cb_HIO_c(); +}; + #endif /* D_A_OBJ_CB_H */ diff --git a/include/rel/d/a/obj/d_a_obj_cblock/d_a_obj_cblock.h b/include/rel/d/a/obj/d_a_obj_cblock/d_a_obj_cblock.h index 71766d4a2f1..52bbcdd98dc 100644 --- a/include/rel/d/a/obj/d_a_obj_cblock/d_a_obj_cblock.h +++ b/include/rel/d/a/obj/d_a_obj_cblock/d_a_obj_cblock.h @@ -1,5 +1,44 @@ #ifndef D_A_OBJ_CBLOCK_H #define D_A_OBJ_CBLOCK_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjCBlk_c + * @brief Castle Block? + * + * @details + * + */ +class daObjCBlk_c : public fopAc_ac_c { +public: + struct chain_s { + public: + /* 80BC5E58 */ ~chain_s(); + /* 80BC5E94 */ chain_s(); + }; + + /* 80BC5A0C */ void initBaseMtx(); + /* 80BC5A48 */ void setBaseMtx(); + /* 80BC5ABC */ void Create(); + /* 80BC5CF8 */ void CreateHeap(); + /* 80BC5E98 */ void create(); + /* 80BC6260 */ void Execute(f32 (**)[3][4]); + /* 80BC6270 */ void initWait(); + /* 80BC627C */ void modeWait(); + /* 80BC6414 */ void initWalk(); + /* 80BC6430 */ void modeWalk(); + /* 80BC65CC */ void getChainBasePos(cXyz*); + /* 80BC6648 */ void setPower(f32); + /* 80BC66DC */ void checkWall(); + /* 80BC6868 */ bool Draw(); + /* 80BC6870 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0xca8 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjCBlk_c) == 0xca8); + #endif /* D_A_OBJ_CBLOCK_H */ diff --git a/include/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.h b/include/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.h index eafbdabf4c1..30d401edb1d 100644 --- a/include/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.h +++ b/include/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.h @@ -4,6 +4,14 @@ #include "d/bg/d_bg_s_movebg_actor.h" #include "d/com/d_com_inf_game.h" +/** + * @ingroup actors-objects + * @class daObjBoard_c + * @brief Clear Board + * + * @details Actor used to function as an invisible wall. + * + */ class daObjBoard_c : public dBgS_MoveBgActor { public: /* 8057B958 */ void initBaseMtx(); @@ -23,6 +31,7 @@ class daObjBoard_c : public dBgS_MoveBgActor { private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ Mtx field_0x5a8; -}; // Size: 0x5D8 +}; +STATIC_ASSERT(sizeof(daObjBoard_c) == 0x5D8); #endif /* D_A_OBJ_CBOARD_H */ diff --git a/include/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.h b/include/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.h index cedd0725b89..c84b095cd95 100644 --- a/include/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.h +++ b/include/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.h @@ -4,6 +4,14 @@ #include "SSystem/SComponent/c_phase.h" #include "d/bg/d_bg_s_movebg_actor.h" +/** + * @ingroup actors-objects + * @class daObjCdoor_c + * @brief Chain Door + * + * @details + * + */ class daObjCdoor_c : public dBgS_MoveBgActor { public: enum Mode { @@ -43,6 +51,7 @@ class daObjCdoor_c : public dBgS_MoveBgActor { int getSwitchNum() { return mSw; } void setChainID(u32 i_id) { mChainID = i_id; } +private: /* 0x5A0 */ request_of_phase_process_class mPhaseReq; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ bool mEnd; diff --git a/include/rel/d/a/obj/d_a_obj_chandelier/d_a_obj_chandelier.h b/include/rel/d/a/obj/d_a_obj_chandelier/d_a_obj_chandelier.h index 40e20b1b61f..be5ed12c3ff 100644 --- a/include/rel/d/a/obj/d_a_obj_chandelier/d_a_obj_chandelier.h +++ b/include/rel/d/a/obj/d_a_obj_chandelier/d_a_obj_chandelier.h @@ -7,6 +7,14 @@ class daObjChandelier_c; typedef void (daObjChandelier_c::*daObjChandelier_proc)(); +/** + * @ingroup actors-objects + * @class daObjChandelier_c + * @brief Hyrule Castle Chandelier + * + * @details + * + */ class daObjChandelier_c : public dBgS_MoveBgActor, public request_of_phase_process_class { public: enum Mode { @@ -39,6 +47,7 @@ class daObjChandelier_c : public dBgS_MoveBgActor, public request_of_phase_proce u8 getSW_0() { return fopAcM_GetParamBit(this, 4, 8); } s32 getArg_0() { return fopAcM_GetParamBit(this, 0, 4); } +private: /* 0x5A8 */ cXyz field_0x5a8; /* 0x5B4 */ Mtx mMtx; /* 0x5E4 */ u8 field_0x5e4[4]; diff --git a/include/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.h b/include/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.h index e15e29b67ac..10a07ef35b9 100644 --- a/include/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.h +++ b/include/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.h @@ -6,6 +6,14 @@ #include "d/com/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" +/** + * @ingroup actors-objects + * @class daObjChest_c + * @brief Cabinet + * + * @details + * + */ class daObjChest_c : public dBgS_MoveBgActor { public: enum daObjChest_Action { @@ -31,6 +39,7 @@ class daObjChest_c : public dBgS_MoveBgActor { u8 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); } u32 getArg0() { return fopAcM_GetParamBit(this, 8, 4); } +private: /* 0x5A0 */ request_of_phase_process_class mPhaseReq; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ dBgS_ObjAcch mObjAcch; @@ -48,6 +57,7 @@ class daObjChest_c : public dBgS_MoveBgActor { /* 0xA9A */ s16 mRandomRotX; /* 0xA9C */ f32 field_0xa9c; /* 0xAA0 */ f32 mScaleY; -}; // Size: 0xAA4 +}; +STATIC_ASSERT(sizeof(daObjChest_c) == 0xAA4); #endif /* D_A_OBJ_CHEST_H */ diff --git a/include/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.h b/include/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.h index b16caa4962e..5cdebfdced1 100644 --- a/include/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.h +++ b/include/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.h @@ -8,6 +8,14 @@ #include "d/a/d_a_player.h" #include "d/d_insect.h" +/** + * @ingroup actors-objects + * @class daObjCHO_c + * @brief Insect - Butterfly + * + * @details + * + */ class daObjCHO_c : public dInsect_c { public: enum Action { @@ -38,6 +46,7 @@ class daObjCHO_c : public dInsect_c { /* 80BCC01C */ cPhs__Step create(); inline int Draw(); +private: /* 0x590 */ dBgS_AcchCir mAcchCir; /* 0x5D0 */ dBgS_ObjAcch mAcch; /* 0x7A8 */ dCcD_Stts mCcStts; diff --git a/include/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.h b/include/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.h index 0e40f053293..6201637e392 100644 --- a/include/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.h +++ b/include/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.h @@ -4,6 +4,14 @@ #include "d/bg/d_bg_s_movebg_actor.h" #include "d/com/d_com_inf_game.h" +/** + * @ingroup actors-objects + * @class daCowdoor_c + * @brief Ordon Ranch Stable Door + * + * @details + * + */ class daCowdoor_c : public dBgS_MoveBgActor { public: /* 80BCC7F8 */ void setBaseMtx(); @@ -14,8 +22,10 @@ class daCowdoor_c : public dBgS_MoveBgActor { /* 80BCCA48 */ int Draw(); /* 80BCCAEC */ int Delete(); +private: /* 0x5A0 */ request_of_phase_process_class field_0x5a0; /* 0x5A8 */ J3DModel* field_0x5a8; -}; // Size: 0x5AC +}; +STATIC_ASSERT(sizeof(daCowdoor_c) == 0x5AC); #endif /* D_A_OBJ_COWDOOR_H */ diff --git a/include/rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.h b/include/rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.h index b62b382e806..43539203b28 100644 --- a/include/rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.h +++ b/include/rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.h @@ -4,6 +4,14 @@ #include "f_op/f_op_actor_mng.h" #include "d/cc/d_cc_d.h" +/** + * @ingroup actors-objects + * @class daObjCrope_c + * @brief Wolf Tightrope + * + * @details + * + */ class daObjCrope_c : public fopAc_ac_c { public: /* 80BCCCD8 */ int createHeap(); @@ -37,6 +45,7 @@ class daObjCrope_c : public fopAc_ac_c { setBackJoint(-1); } +private: /* 0x0568 */ request_of_phase_process_class mPhase; /* 0x0570 */ dCcD_Stts mCcStts; /* 0x05AC */ dCcD_Sph mCollider; @@ -54,5 +63,7 @@ class daObjCrope_c : public fopAc_ac_c { /* 0x0BD8 */ cXyz field_0xbd8[98]; /* 0x1070 */ mDoExt_3DlineMat1_c mLineMat; }; +STATIC_ASSERT(sizeof(daObjCrope_c) == 0x10ac); + #endif /* D_A_OBJ_CROPE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence.h b/include/rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence.h index 87fed198113..ac5cc2f4e68 100644 --- a/include/rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence.h +++ b/include/rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence.h @@ -1,6 +1,39 @@ #ifndef D_A_OBJ_CRVFENCE_H #define D_A_OBJ_CRVFENCE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjCRVFENCE_c + * @brief Caravan Fence + * + * @details + * + */ +class daObjCRVFENCE_c : public fopAc_ac_c { +public: + /* 80BCEC98 */ void CheckVec(); + /* 80BCED60 */ void Wall_Check(cXyz, cXyz); + /* 80BCEE60 */ void BgRelease(); + /* 80BCEED0 */ void PosSet(cXyz*); + /* 80BCEF30 */ void FenceMove(u8&, cXyz*, csXyz*, cXyz*, s16&); + /* 80BCF0B0 */ void BrokenAction(); + /* 80BCF404 */ void NormalAction(); + /* 80BCF7DC */ void checkViewArea(cXyz*); + /* 80BCF860 */ void Action(); + /* 80BCF8A4 */ void setBaseMtx(); + /* 80BCF9E4 */ void CreateHeap(); + /* 80BCFAE4 */ void create(); + /* 80BCFFC8 */ void Create(); + /* 80BD000C */ void Execute(f32 (**)[3][4]); + /* 80BD0058 */ void Draw(); + /* 80BD013C */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x103c - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjCRVFENCE_c) == 0x103c); + #endif /* D_A_OBJ_CRVFENCE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate.h b/include/rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate.h index da6f91fab4d..cff6bbfbc19 100644 --- a/include/rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate.h +++ b/include/rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate.h @@ -1,6 +1,51 @@ #ifndef D_A_OBJ_CRVGATE_H #define D_A_OBJ_CRVGATE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjCRVGATE_c + * @brief Caravan Gate + * + * @details + * + */ +class daObjCRVGATE_c : public fopAc_ac_c { +public: + /* 80BD0398 */ void initCcCylinder(); + /* 80BD0500 */ void setCcCylinder(); + /* 80BD069C */ void checkOpen(); + /* 80BD0880 */ void actionStartEvent(); + /* 80BD0978 */ void actionWaitEvent(); + /* 80BD0A64 */ void Demo_Set(); + /* 80BD0B7C */ void SetOpen(); + /* 80BD0B88 */ void actionDemoEvent(); + /* 80BD0D28 */ void event_proc_call(); + /* 80BD0D90 */ void CheckVec(); + /* 80BD0E1C */ void KeyVib(); + /* 80BD0F9C */ void DoorVib(); + /* 80BD10C0 */ void VibStop(); + /* 80BD10D0 */ void CloseVibration(); + /* 80BD1110 */ void CloseAction(); + /* 80BD18E0 */ void OpenAction(); + /* 80BD21E4 */ void HakaiMotion(); + /* 80BD22C8 */ void DoorAction(); + /* 80BD2338 */ void B_CloseAction(); + /* 80BD245C */ void SetB_Close(); + /* 80BD2528 */ void setBaseMtx(); + /* 80BD2670 */ void CreateHeap(); + /* 80BD2758 */ void SetDoor(); + /* 80BD28C0 */ void create(); + /* 80BD2E88 */ void Create(); + /* 80BD2ECC */ void Execute(f32 (**)[3][4]); + /* 80BD2FB8 */ void Draw(); + /* 80BD3074 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0xde4 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjCRVGATE_c) == 0xde4); + #endif /* D_A_OBJ_CRVGATE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_crvhahen/d_a_obj_crvhahen.h b/include/rel/d/a/obj/d_a_obj_crvhahen/d_a_obj_crvhahen.h index 6203ebc5e8c..0e6fbd49d1d 100644 --- a/include/rel/d/a/obj/d_a_obj_crvhahen/d_a_obj_crvhahen.h +++ b/include/rel/d/a/obj/d_a_obj_crvhahen/d_a_obj_crvhahen.h @@ -1,6 +1,32 @@ #ifndef D_A_OBJ_CRVHAHEN_H #define D_A_OBJ_CRVHAHEN_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjCRVHAHEN_c + * @brief Caravan Wood + * + * @details + * + */ +class daObjCRVHAHEN_c : public fopAc_ac_c { +public: + /* 80BD342C */ void HahenSet(cXyz, cXyz, cXyz, cXyz, f32); + /* 80BD3628 */ void Wall_Check(cXyz, cXyz); + /* 80BD3720 */ void Hahen_Hakai(int, int); + /* 80BD38DC */ void CheckCull(); + /* 80BD3A9C */ void checkViewArea(cXyz*); + /* 80BD3B20 */ void Execute(); + /* 80BD3B74 */ void Delete(); + /* 80BD3C0C */ void setBaseMtx(); + /* 80BD3DBC */ void create(); + +private: + /* 0x568 */ u8 field_0x568[0x794 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjCRVHAHEN_c) == 0x794); + #endif /* D_A_OBJ_CRVHAHEN_H */ diff --git a/include/rel/d/a/obj/d_a_obj_crvlh_down/d_a_obj_crvlh_down.h b/include/rel/d/a/obj/d_a_obj_crvlh_down/d_a_obj_crvlh_down.h index cf1b3c10507..c2266eced3c 100644 --- a/include/rel/d/a/obj/d_a_obj_crvlh_down/d_a_obj_crvlh_down.h +++ b/include/rel/d/a/obj/d_a_obj_crvlh_down/d_a_obj_crvlh_down.h @@ -1,5 +1,35 @@ #ifndef D_A_OBJ_CRVLH_DOWN_H #define D_A_OBJ_CRVLH_DOWN_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjCRVLH_DW_c + * @brief Bulblin Tower (Lower Half) + * + * @details + * + */ +class daObjCRVLH_DW_c : public fopAc_ac_c { +public: + /* 80BD4138 */ void initCcCylinder(); + /* 80BD41A4 */ void SetCcSyl(); + /* 80BD4268 */ void BgRelease(); + /* 80BD42D8 */ void Break(); + /* 80BD45A4 */ void Obj_Hit(); + /* 80BD4644 */ void setBaseMtx(); + /* 80BD46EC */ void CreateHeap(); + /* 80BD4764 */ void create(); + /* 80BD4A84 */ void Create(); + /* 80BD4AC8 */ void Execute(f32 (**)[3][4]); + /* 80BD4C44 */ void Draw(); + /* 80BD4CC8 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x74c - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjCRVLH_DW_c) == 0x74c); + #endif /* D_A_OBJ_CRVLH_DOWN_H */ diff --git a/include/rel/d/a/obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up.h b/include/rel/d/a/obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up.h index ba489d23186..56e5cc3aeac 100644 --- a/include/rel/d/a/obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up.h +++ b/include/rel/d/a/obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up.h @@ -1,6 +1,33 @@ #ifndef D_A_OBJ_CRVLH_UP_H #define D_A_OBJ_CRVLH_UP_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjCRVLH_UP_c + * @brief Bulblin Tower (Upper Half) + * + * @details + * + */ +class daObjCRVLH_UP_c : public fopAc_ac_c { +public: + /* 80BD4F1C */ void HakaiSet(); + /* 80BD4FB0 */ void UpMotion(); + /* 80BD4FD8 */ void Hakai(); + /* 80BD5254 */ void setBaseMtx(); + /* 80BD5378 */ void CreateHeap(); + /* 80BD53F0 */ void create(); + /* 80BD56EC */ void Create(); + /* 80BD5730 */ void Execute(f32 (**)[3][4]); + /* 80BD593C */ void Draw(); + /* 80BD59C0 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x770 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjCRVLH_UP_c) == 0x770); + #endif /* D_A_OBJ_CRVLH_UP_H */ diff --git a/include/rel/d/a/obj/d_a_obj_crvsteel/d_a_obj_crvsteel.h b/include/rel/d/a/obj/d_a_obj_crvsteel/d_a_obj_crvsteel.h index d95f8f3b005..b5327594dc1 100644 --- a/include/rel/d/a/obj/d_a_obj_crvsteel/d_a_obj_crvsteel.h +++ b/include/rel/d/a/obj/d_a_obj_crvsteel/d_a_obj_crvsteel.h @@ -1,6 +1,35 @@ #ifndef D_A_OBJ_CRVSTEEL_H #define D_A_OBJ_CRVSTEEL_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjCRVSTEEL_c + * @brief Caravan Steel + * + * @details + * + */ +class daObjCRVSTEEL_c : public fopAc_ac_c { +public: + /* 80BD5BFC */ void OpenSet(f32, f32); + /* 80BD5C18 */ void CloseSet(f32); + /* 80BD5C28 */ void CloseExecute(); + /* 80BD5CA0 */ void OpenExecute(); + /* 80BD5CC8 */ void Action(); + /* 80BD5D10 */ void setBaseMtx(); + /* 80BD5DB8 */ void CreateHeap(); + /* 80BD5E30 */ void create(); + /* 80BD60A8 */ void Create(); + /* 80BD60EC */ void Execute(f32 (**)[3][4]); + /* 80BD6138 */ void Draw(); + /* 80BD61BC */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x848 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjCRVSTEEL_c) == 0x848); + #endif /* D_A_OBJ_CRVSTEEL_H */ diff --git a/include/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.h b/include/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.h index ec42e9c70a7..692701b53e1 100644 --- a/include/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.h +++ b/include/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.h @@ -3,6 +3,14 @@ #include "f_op/f_op_actor_mng.h" +/** + * @ingroup actors-objects + * @class daObjCrystal_c + * @brief Crystal Switch + * + * @details + * + */ class daObjCrystal_c : public fopAc_ac_c { public: /* 80BD63B8 */ void initBaseMtx(); @@ -14,10 +22,12 @@ class daObjCrystal_c : public fopAc_ac_c { /* 80BD673C */ int draw(); /* 80BD67C8 */ int _delete(); +private: /* 0x568 */ request_of_phase_process_class mPhase; /* 0x570 */ J3DModel* mpModel[2]; /* 0x578 */ JPABaseEmitter* mpEmitter; /* 0x57C */ u16 mJointID; }; +STATIC_ASSERT(sizeof(daObjCrystal_c) == 0x580); #endif /* D_A_OBJ_CRYSTAL_H */ diff --git a/include/rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall.h b/include/rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall.h index 49d71cc17d1..d70aa084be2 100644 --- a/include/rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall.h +++ b/include/rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall.h @@ -1,5 +1,55 @@ #ifndef D_A_OBJ_CWALL_H #define D_A_OBJ_CWALL_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjCwall_c + * @brief Chain Wall + * + * @details + * + */ +class daObjCwall_c : public fopAc_ac_c { +public: + struct chain_s { + public: + /* 80BD6E94 */ ~chain_s(); + /* 80BD6ED0 */ chain_s(); + }; + + + /* 80BD6A4C */ void initBaseMtx(); + /* 80BD6A88 */ void setBaseMtx(); + /* 80BD6AEC */ void Create(); + /* 80BD6D08 */ void CreateHeap(); + /* 80BD6ED4 */ void create1st(); + /* 80BD6F80 */ void Execute(f32 (**)[3][4]); + /* 80BD7288 */ void setTension(); + /* 80BD7718 */ void calcSePos(); + /* 80BD7788 */ void getChainBasePos(cXyz*); + /* 80BD7804 */ void setChainMtx(); + /* 80BD7AD4 */ void chain_control(); + /* 80BD7ED8 */ void chain_control2(); + /* 80BD84C0 */ void block_mode_proc_call(); + /* 80BD8594 */ void initWait(); + /* 80BD85C0 */ void modeWait(); + /* 80BD8748 */ void initWalk(); + /* 80BD8778 */ void modeWalk(); + /* 80BD8BC8 */ void initClose(); + /* 80BD8BF0 */ void modeClose(); + /* 80BD935C */ void setPower(f32, s16*); + /* 80BD9414 */ void checkWall(); + /* 80BD95A0 */ void checkPullNow(); + /* 80BD977C */ void checkPull(); + /* 80BD9848 */ void Draw(); + /* 80BD9948 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0xf5c - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjCwall_c) == 0xf5c); + #endif /* D_A_OBJ_CWALL_H */ diff --git a/include/rel/d/a/obj/d_a_obj_damCps/d_a_obj_damCps.h b/include/rel/d/a/obj/d_a_obj_damCps/d_a_obj_damCps.h index 4e769ffe96f..e395ed8137a 100644 --- a/include/rel/d/a/obj/d_a_obj_damCps/d_a_obj_damCps.h +++ b/include/rel/d/a/obj/d_a_obj_damCps/d_a_obj_damCps.h @@ -1,6 +1,6 @@ #ifndef D_A_OBJ_DAMCPS_H #define D_A_OBJ_DAMCPS_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" #endif /* D_A_OBJ_DAMCPS_H */ diff --git a/include/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.h b/include/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.h index 38d91a86400..e9f35f2abea 100644 --- a/include/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.h +++ b/include/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.h @@ -1,5 +1,49 @@ #ifndef D_A_OBJ_DAN_H #define D_A_OBJ_DAN_H +#include "f_op/f_op_actor_mng.h" +#include "d/d_insect.h" + +/** + * @ingroup actors-objects + * @class daObjDAN_c + * @brief Insect - Pillbug + * + * @details + * + */ +class daObjDAN_c : public fopAc_ac_c { +public: + /* 80BDA5B4 */ void InitCcSph(); + /* 80BDA620 */ void SetCcSph(); + /* 80BDA698 */ void CreateHeap(); + /* 80BDAA3C */ void SpeedSet(); + /* 80BDAA9C */ void LinkChk(); + /* 80BDAB14 */ void MoveAction(); + /* 80BDAC10 */ void DamageAction(); + /* 80BDAFDC */ void Action(); + /* 80BDB074 */ void checkGroundPos(); + /* 80BDB0D8 */ void Insect_Release(); + /* 80BDB0E8 */ void Z_BufferChk(); + /* 80BDB264 */ void ParticleSet(); + /* 80BDB388 */ void ObjHit(); + /* 80BDB4E0 */ void BoomChk(); + /* 80BDB62C */ void Execute(); + /* 80BDB928 */ void Delete(); + /* 80BDB990 */ void setBaseMtx(); + /* 80BDBB0C */ void CreateChk(); + /* 80BDBCB8 */ void create(); + +private: + /* 0x568 */ u8 field_0x568[0xa6c - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjDAN_c) == 0xa6c); + + +class daObj_DanHIO_c { +public: + /* 80BDA58C */ daObj_DanHIO_c(); + /* 80BDC2F0 */ ~daObj_DanHIO_c(); +}; #endif /* D_A_OBJ_DAN_H */ diff --git a/include/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.h b/include/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.h index 69caac380ce..104f9cef179 100644 --- a/include/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.h +++ b/include/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.h @@ -3,6 +3,14 @@ #include "d/com/d_com_inf_game.h" +/** + * @ingroup actors-objects + * @class daObjDigholl_c + * @brief Wolf Dig Place (Passage) + * + * @details + * + */ class daObjDigholl_c : public fopAc_ac_c { public: /* 80BDC618 */ int create(); @@ -10,6 +18,7 @@ class daObjDigholl_c : public fopAc_ac_c { /* 80BDC7D8 */ int execute(); /* 80BDCB0C */ int draw(); +private: /* 0x568 */ u8 field_0x568; /* 0x569 */ u8 field_0x569; /* 0x56A */ u8 field_0x56a; diff --git a/include/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.h b/include/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.h index 5ce77d9a1e8..043151fc235 100644 --- a/include/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.h +++ b/include/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.h @@ -4,11 +4,20 @@ #include "d/d_path.h" #include "f_op/f_op_actor_mng.h" +/** + * @ingroup actors-objects + * @class daObjDigpl_c + * @brief Wolf Dig Place (Treasure) + * + * @details + * + */ class daObjDigpl_c : public fopAc_ac_c { public: /* 8057BF98 */ int create(); /* 8057C1EC */ int execute(); +private: /* 0x568 */ u8 mType; /* 0x569 */ u8 mSwitch; /* 0x56A */ u8 mDigFlg; @@ -18,10 +27,12 @@ class daObjDigpl_c : public fopAc_ac_c { /* 0x5A0 */ int mUsedDigFlags[6]; /* 0x5B8 */ dPath* mpDigPoints; +public: /* 8057C158 */ virtual ~daObjDigpl_c(); u8 getSceneNum() { return (fopAcM_GetParam(this) >> 0xC) & 0xFF; } int getItemNum() { return getSceneNum(); } }; +STATIC_ASSERT(sizeof(daObjDigpl_c) == 0x5C0); #endif /* D_A_OBJ_DIGPLACE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.h b/include/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.h index 135e8f842b6..1fc14354a5a 100644 --- a/include/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.h +++ b/include/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.h @@ -8,6 +8,14 @@ class J3DModel; +/** + * @ingroup actors-objects + * @class daObjDigSnow_c + * @brief Wolf Dig Place (Snow) + * + * @details + * + */ class daObjDigSnow_c : public dBgS_MoveBgActor { public: enum Mode_e { diff --git a/include/rel/d/a/obj/d_a_obj_dmelevator/d_a_obj_dmelevator.h b/include/rel/d/a/obj/d_a_obj_dmelevator/d_a_obj_dmelevator.h index 91eba52b0bd..2a107df46c6 100644 --- a/include/rel/d/a/obj/d_a_obj_dmelevator/d_a_obj_dmelevator.h +++ b/include/rel/d/a/obj/d_a_obj_dmelevator/d_a_obj_dmelevator.h @@ -3,5 +3,96 @@ #include "d/bg/d_bg_s_movebg_actor.h" #include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjDmElevator_c + * @brief Death Mountain Elevator + * + * @details + * + */ +class daObjDmElevator_c : public dBgS_MoveBgActor { +public: + /* 80BDDD38 */ void initBaseMtx(); + /* 80BDDD90 */ void setBaseMtx(); + /* 80BDDEFC */ int Create(); + /* 80BDE0A4 */ int init(); + /* 80BDE2F8 */ int CreateHeap(); + /* 80BDE448 */ int create1st(); + /* 80BDE500 */ int Execute(Mtx**); + /* 80BDE5F8 */ void setting_ride_flag(); + /* 80BDE6FC */ void event_sw_proc_call(); + /* 80BDE7A0 */ void actionSwPauseNoneInit(); + /* 80BDE7AC */ void actionSwPauseNone(); + /* 80BDE7B0 */ void actionSwPauseOrderInit(); + /* 80BDE808 */ void actionSwPauseOrder(); + /* 80BDE83C */ void actionSwPauseInit(); + /* 80BDE868 */ void actionSwPause(); + /* 80BDE8D0 */ void calc_top_pos(); + /* 80BDE960 */ void mode_sw_proc_call(); + /* 80BDEA1C */ void modeSwWaitLowerInit(); + /* 80BDEA44 */ void modeSwWaitLower(); + /* 80BDEB88 */ void modeSwLowerInit(); + /* 80BDEC10 */ void modeSwLower(); + /* 80BDEC94 */ void modeSwWaitUpperInit(); + /* 80BDECB4 */ void modeSwWaitUpper(); + /* 80BDECE0 */ void modeSwUpperInit(); + /* 80BDED64 */ void modeSwUpper(); + /* 80BDEDE0 */ void event_proc_call(); + /* 80BDEECC */ void actionWait(); + /* 80BDEF60 */ void actionOrderEvent(); + /* 80BDF000 */ void actionEvent(); + /* 80BDF068 */ void actionStartEvent(); + /* 80BDF0A0 */ void actionMoveStart(); + /* 80BDF168 */ void actionDead(); + /* 80BDF16C */ int demoProc(); + /* 80BDF320 */ void moveInit(); + /* 80BDF3B8 */ int moveProc(); + /* 80BDF618 */ int Draw(); + /* 80BDF6DC */ int Delete(); + + u32 getPathID() { return fopAcM_GetParamBit(this, 8, 8); } + +private: + /* 0x5A0 */ request_of_phase_process_class mPhaseReq; + /* 0x5A8 */ request_of_phase_process_class mPhaseReq2; + /* 0x5B0 */ J3DModel* mpElevatorModel; + /* 0x5B4 */ J3DModel* mpSwitchModel; + /* 0x5B8 */ Z2SoundObjSimple mSoundObj; + /* 0x5D8 */ u8 field_0x5D8[0x5DC - 0x5D8]; + /* 0x5DC */ s32 field_0x5dc; + /* 0x5E0 */ u8 field_0x5e0; + /* 0x5E1 */ u8 field_0x5e1; + /* 0x5E2 */ u8 field_0x5e2; + /* 0x5E3 */ u8 field_0x5e3; + /* 0x5E4 */ s16 field_0x5e4; + /* 0x5E6 */ s16 field_0x5e6; + /* 0x5E8 */ dBgW* mpBgW; + /* 0x5EC */ Mtx mMtx; + /* 0x61C */ cXyz mXyz; + /* 0x628 */ u8 field_0x628; + /* 0x629 */ u8 field_0x629; + /* 0x62A */ u8 field_0x62a; + /* 0x62B */ u8 field_0x62b; + /* 0x62C */ u8 field_0x62C[0x62D - 0x62C]; + /* 0x62D */ u8 field_0x62d; + /* 0x62E */ u8 field_0x62e; + /* 0x62F */ u8 field_0x62f; + /* 0x630 */ u8 field_0x630; + /* 0x631 */ u8 field_0x631; + /* 0x632 */ u8 field_0x632; + /* 0x633 */ u8 field_0x633; + /* 0x634 */ u8 field_0x634; + /* 0x635 */ u8 field_0x635; + /* 0x636 */ u8 field_0x636; + /* 0x637 */ u8 field_0x637; + /* 0x638 */ f32 field_0x638; + /* 0x63C */ f32 field_0x63c; + /* 0x640 */ f32 field_0x640; +}; +STATIC_ASSERT(sizeof(daObjDmElevator_c) == 0x644); + #endif /* D_A_OBJ_DMELEVATOR_H */ diff --git a/include/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.h b/include/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.h index 7e1c81c04ee..65273a162af 100644 --- a/include/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.h +++ b/include/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.h @@ -1,5 +1,43 @@ #ifndef D_A_OBJ_DROP_H #define D_A_OBJ_DROP_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjDrop_c + * @brief Tear of Light + * + * @details + * + */ +class daObjDrop_c : public fopAc_ac_c { +public: + /* 80BDFD8C */ void Create(); + /* 80BDFE58 */ void create(); + /* 80BE0358 */ void dropGet(); + /* 80BE0430 */ void checkGetArea(); + /* 80BE05DC */ void checkCompleteDemo(); + /* 80BE0658 */ void createLineEffect(); + /* 80BE071C */ void removeLineEffect(); + /* 80BE077C */ void createBodyEffect(); + /* 80BE0840 */ void removeBodyEffect(); + /* 80BE08A0 */ void modeInit(); + /* 80BE0994 */ void modeNoParent(); + /* 80BE09F4 */ void modeParentWait(); + /* 80BE0C08 */ void modeWait(); + /* 80BE1928 */ bool actionCompleteWait(); + /* 80BE1930 */ void actionOrderCompleteDemo(); + /* 80BE19D0 */ void actionCompleateDemo(); + /* 80BE1ACC */ void actionWaitCompleteGetDemo(); + /* 80BE1B5C */ void actionCompleteGetDemo(); + /* 80BE1BC4 */ void execute(); + /* 80BE1DCC */ void _delete(); + +private: + /* 0x568 */ u8 field_0x568[0xa7c - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjDrop_c) == 0xa7c); + #endif /* D_A_OBJ_DROP_H */ diff --git a/include/rel/d/a/obj/d_a_obj_dust/d_a_obj_dust.h b/include/rel/d/a/obj/d_a_obj_dust/d_a_obj_dust.h index f179d8814c7..b1d0accb8dd 100644 --- a/include/rel/d/a/obj/d_a_obj_dust/d_a_obj_dust.h +++ b/include/rel/d/a/obj/d_a_obj_dust/d_a_obj_dust.h @@ -1,6 +1,33 @@ #ifndef D_A_OBJ_DUST_H #define D_A_OBJ_DUST_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjDust_c + * @brief Dust + * + * @details + * + */ +class daObjDust_c : public fopAc_ac_c { +public: + /* 80BE22B8 */ void Search_Ymb(); + /* 80BE2490 */ void RideOn_Angle(s16&, f32, s16, f32); + /* 80BE24F8 */ void Check_RideOn(); + /* 80BE2708 */ void initBaseMtx(); + /* 80BE2734 */ void setBaseMtx(); + /* 80BE2A70 */ void CreateHeap(); + /* 80BE2AE8 */ void Create(); + /* 80BE2B30 */ void Execute(f32 (**)[3][4]); + /* 80BE2E9C */ void Draw(); + /* 80BE2F40 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x84c - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjDust_c) == 0x84c); + #endif /* D_A_OBJ_DUST_H */ diff --git a/include/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.h b/include/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.h index 7de09595031..966117ecdf9 100644 --- a/include/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.h +++ b/include/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.h @@ -3,7 +3,22 @@ #include "f_op/f_op_actor_mng.h" +/** + * @ingroup actors-objects + * @namespace daObjEff + * @brief Object Effect? + * + * @details + * + */ namespace daObjEff { +/** + * @class Act_c + * @brief Actor Object Effect? + * + * @details + * + */ class Act_c : public fopAc_ac_c { public: enum Prm_e { @@ -21,4 +36,11 @@ class Act_c : public fopAc_ac_c { }; }; // namespace daObjEff +struct daObj { +public: + template + static int PrmAbstract(const fopAc_ac_c* param_0, T param_1, T param_2); +}; + + #endif /* D_A_OBJ_EFF_H */ diff --git a/include/rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.h b/include/rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.h index 64ad81de56d..04221e4ba84 100644 --- a/include/rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.h +++ b/include/rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.h @@ -3,6 +3,14 @@ #include "d/com/d_com_inf_game.h" +/** + * @ingroup actors-objects + * @class daObjE_CREATE_c + * @brief Enemy Spawner + * + * @details + * + */ class daObjE_CREATE_c : public fopAc_ac_c { public: /* 80BE31BC */ void NormalAction(); @@ -28,7 +36,8 @@ class daObjE_CREATE_c : public fopAc_ac_c { /* 0x582 */ s16 mKillCheckDelayTimer; /* 0x584 */ u8 mAction; /* 0x588 */ u8 unused[12]; -}; // Size: 0x594 +}; +STATIC_ASSERT(sizeof(daObjE_CREATE_c) == 0x594); enum daObjE_EnemyType { ENEMY_NONE, diff --git a/include/rel/d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj.h b/include/rel/d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj.h index 897daf799be..cd4415db428 100644 --- a/include/rel/d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj.h +++ b/include/rel/d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj.h @@ -3,5 +3,61 @@ #include "d/bg/d_bg_s_movebg_actor.h" #include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjFallObj_c + * @brief Fall Object? + * + * @details + * + */ +class daObjFallObj_c : public dBgS_MoveBgActor { +public: +public: + /* 80BE39B8 */ void initBaseMtx(); + /* 80BE3A24 */ void setBaseMtx(); + /* 80BE3A88 */ int Create(); + /* 80BE3BA8 */ void getFallTime(); + /* 80BE3BD4 */ void getFallHeight(); + /* 80BE3C28 */ int CreateHeap(); + /* 80BE3C98 */ int create1st(); + /* 80BE3D24 */ int Execute(Mtx**); + /* 80BE4138 */ void action(); + /* 80BE4228 */ void action_wait(bool); + /* 80BE42C0 */ void action_fallStart(); + /* 80BE43E4 */ void action_countdown(); + /* 80BE45F4 */ void action_fall(); + /* 80BE466C */ void action_end(); + /* 80BE4670 */ void action_follow_fall(); + /* 80BE4700 */ void checkHang(); + /* 80BE47A0 */ void checkHang2(); + /* 80BE48A4 */ int Draw(); + /* 80BE4948 */ int Delete(); + + u32 getTime() { return fopAcM_GetParamBit(this, 8, 8); } + u32 getPos() { return fopAcM_GetParamBit(this, 0x14, 8); } + BOOL checkFallStart() { return fopAcM_SearchByID(parentActorID)->speed.y != 0.0f; } + +private: + /* 0x5A0 */ request_of_phase_process_class mPhaseReq; + /* 0x5A8 */ Mtx mMtx; + /* 0x5D8 */ u8 field_0x5d8; + /* 0x5D9 */ u8 field_0x5d9; + /* 0x5DA */ s16 field_0x5da; + /* 0x5DC */ s16 field_0x5dc; + /* 0x5DE */ s16 field_0x5de; + /* 0x5E0 */ s32 field_0x5e0; + /* 0x5E4 */ u8 field_0x5e4; + /* 0x5E5 */ u8 field_0x5e5; + /* 0x5E8 */ J3DModel* mpModel; + /* 0x5EC */ s32 field_0x5ec; + /* 0x5F0 */ u8 field_0x5f0; + /* 0x5F1 */ u8 field_0x5f1; + /* 0x5F4 */ Z2SoundObjSimple mSoundObj; +}; +STATIC_ASSERT(sizeof(daObjFallObj_c) == 0x614); + #endif /* D_A_OBJ_FALLOBJ_H */ diff --git a/include/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.h b/include/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.h index c00a18230f8..283498b55ac 100644 --- a/include/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.h +++ b/include/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.h @@ -5,7 +5,16 @@ #include "d/cc/d_cc_d.h" #include "f_op/f_op_actor_mng.h" -struct daObjFan_c : public dBgS_MoveBgActor { +/** + * @ingroup actors-objects + * @class daObjFan_c + * @brief (City in the Sky?) Fan) + * + * @details + * + */ +class daObjFan_c : public dBgS_MoveBgActor { +public: /* 80BE4D98 */ fopAc_ac_c* search_tornado(); /* 80BE4E08 */ void initBaseMtx(); /* 80BE4E44 */ void setBaseMtx(); @@ -20,6 +29,7 @@ struct daObjFan_c : public dBgS_MoveBgActor { u8 getType() { return fopAcM_GetParamBit(this,0,4); } +private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mModel; /* 0x5AC */ dBgW* field_0x5ac; @@ -31,5 +41,6 @@ struct daObjFan_c : public dBgS_MoveBgActor { /* 0xAD4 */ u8 field_0xad4; /* 0xAD8 */ cXyz field_0xad8; }; +STATIC_ASSERT(sizeof(daObjFan_c) == 0xAE4); #endif /* D_A_OBJ_FAN_H */ diff --git a/include/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.h b/include/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.h index 27023248e8a..4ba07b079b5 100644 --- a/include/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.h +++ b/include/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.h @@ -1,6 +1,36 @@ #ifndef D_A_OBJ_FCHAIN_H #define D_A_OBJ_FCHAIN_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +class daObjFchain_shape_c { +public: + /* 80BE7194 */ void draw(); + /* 80BE73D4 */ ~daObjFchain_shape_c(); +}; + +/** + * @ingroup actors-objects + * @class daObjFchain_c + * @brief Wolf Chain Shackle + * + * @details + * + */ +class daObjFchain_c : public fopAc_ac_c { +public: + /* 80BE5FF8 */ void createHeap(); + /* 80BE6074 */ void create(); + /* 80BE63C8 */ ~daObjFchain_c(); + /* 80BE64E0 */ void checkPlayerFoot(cXyz const*, cXyz const*, cXyz*); + /* 80BE66B4 */ void setGroundVec(cXyz*, f32); + /* 80BE6868 */ void execute(); + /* 80BE7324 */ void draw(); + +private: + /* 0x568 */ u8 field_0x568[0x928 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjFchain_c) == 0x928); + #endif /* D_A_OBJ_FCHAIN_H */ diff --git a/include/rel/d/a/obj/d_a_obj_fireWood/d_a_obj_fireWood.h b/include/rel/d/a/obj/d_a_obj_fireWood/d_a_obj_fireWood.h index 58b6bae5ae1..84a13de0a18 100644 --- a/include/rel/d/a/obj/d_a_obj_fireWood/d_a_obj_fireWood.h +++ b/include/rel/d/a/obj/d_a_obj_fireWood/d_a_obj_fireWood.h @@ -3,5 +3,61 @@ #include "d/com/d_com_inf_game.h" #include "m_Do/m_Do_hostIO.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daFireWood_c + * @brief Kakariko Stove Flame? + * + * @details + * + */ +class daFireWood_c : public fopAc_ac_c { +public: + /* 80BE76B0 */ void setBaseMtx(); + /* 80BE7708 */ void create(); + /* 80BE79A0 */ void lightInit(); + /* 80BE7A14 */ void setLight(); + /* 80BE7A38 */ void Execute(); + /* 80BE7E74 */ bool Draw(); + /* 80BE7E7C */ void Delete(); + + static u8 const mCcDObjInfo[48]; + static u8 mCcDCyl[68]; + +private: + /* 0x568 */ u8 field_0x568[0x574 - 0x568]; + /* 0x574 */ dCcD_Stts mStts; + /* 0x5B0 */ dCcD_Cyl mCyl; + /* 0x6EC */ cXyz field_0x6ec; + /* 0x6F8 */ u8 field_0x6f8; + /* 0x6F9 */ u8 field_0x6f9; + /* 0x6FC */ u32 field_0x6fc[4]; + /* 0x70C */ u8 field_0x70c; + /* 0x710 */ cXyz field_0x710; + /* 0x71C */ LIGHT_INFLUENCE mLightInfluence; + /* 0x73C */ u8 field_0x73c; +}; +STATIC_ASSERT(sizeof(daFireWood_c) == 0x740); + +#ifdef NONMATCHING +class daFireWood_HIO_c : public mDoHIO_entry_c { +public: + /* 80BE762C */ daFireWood_HIO_c(); + /* 80BE7F24 */ virtual ~daFireWood_HIO_c(); + + /* 0x4 */ f32 field_0x4; + /* 0x8 */ f32 field_0x8; + /* 0xC */ u8 field_0xc; +}; +#else +struct daFireWood_HIO_c { + /* 80BE762C */ daFireWood_HIO_c(); + /* 80BE7F24 */ ~daFireWood_HIO_c(); +}; +#endif + + #endif /* D_A_OBJ_FIREWOOD_H */ diff --git a/include/rel/d/a/obj/d_a_obj_fireWood2/d_a_obj_fireWood2.h b/include/rel/d/a/obj/d_a_obj_fireWood2/d_a_obj_fireWood2.h index 2953c376728..feb8553af51 100644 --- a/include/rel/d/a/obj/d_a_obj_fireWood2/d_a_obj_fireWood2.h +++ b/include/rel/d/a/obj/d_a_obj_fireWood2/d_a_obj_fireWood2.h @@ -2,5 +2,56 @@ #define D_A_OBJ_FIREWOOD2_H #include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daFireWood2_c + * @brief Torch Stand + * + * @details + * + */ +class daFireWood2_c : public fopAc_ac_c { +public: + /* 80BE82D0 */ void setBaseMtx(); + /* 80BE8328 */ void create(); + /* 80BE8640 */ void lightInit(); + /* 80BE86CC */ void setLight(); + /* 80BE86FC */ void cutLight(); + /* 80BE872C */ void pointLightProc(); + /* 80BE87DC */ void Execute(); + /* 80BE8D98 */ int Draw(); + /* 80BE8DA0 */ void Delete(); + + static u8 const mCcDObjInfo[48]; + static u8 mCcDCyl[68]; + +private: + /* 0x568 */ u8 field_0x568[0x574 - 0x568]; + /* 0x574 */ dCcD_Stts mStts; + /* 0x5B0 */ dCcD_Cyl mCyl; + /* 0x6EC */ cXyz field_0x6ec; + /* 0x6F8 */ u8 field_0x6f8; + /* 0x6F9 */ u8 field_0x6f9; + /* 0x6FA */ u8 field_0x6fa; + /* 0x6FB */ u8 field_0x6fb; + /* 0x6FC */ u32 field_0x6fc; + /* 0x700 */ u32 field_0x700; + /* 0x704 */ u32 field_0x704; + /* 0x708 */ u32 field_0x708; + /* 0x70C */ cXyz field_0x70c; + /* 0x718 */ u8 field_0x718; + /* 0x71C */ f32 field_0x71c; + /* 0x720 */ LIGHT_INFLUENCE mLightInfluence; +}; +STATIC_ASSERT(sizeof(daFireWood2_c) == 0x740); + +class daFireWood2_HIO_c { +public: + /* 80BE824C */ daFireWood2_HIO_c(); + /* 80BE8E54 */ ~daFireWood2_HIO_c(); +}; + #endif /* D_A_OBJ_FIREWOOD2_H */ diff --git a/include/rel/d/a/obj/d_a_obj_firepillar/d_a_obj_firepillar.h b/include/rel/d/a/obj/d_a_obj_firepillar/d_a_obj_firepillar.h index 9ff2adfe26f..f7297a0f0e8 100644 --- a/include/rel/d/a/obj/d_a_obj_firepillar/d_a_obj_firepillar.h +++ b/include/rel/d/a/obj/d_a_obj_firepillar/d_a_obj_firepillar.h @@ -1,5 +1,37 @@ #ifndef D_A_OBJ_FIREPILLAR_H #define D_A_OBJ_FIREPILLAR_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjFPillar_c + * @brief Fire Pillar + * + * @details + * + */ +class daObjFPillar_c : public fopAc_ac_c { +public: + /* 80BE9118 */ void initBaseMtx(); + /* 80BE9138 */ void setBaseMtx(); + /* 80BE9190 */ void Create(); + /* 80BE9230 */ void create(); + /* 80BE94E4 */ void execute(); + /* 80BE9610 */ void action(); + /* 80BE96B4 */ void actionOffInit(); + /* 80BE96E0 */ void actionOff(); + /* 80BE9784 */ void actionOnWaitInit(); + /* 80BE97B8 */ void actionOnWait(); + /* 80BE986C */ void actionOnInit(); + /* 80BE98A0 */ void actionOn(); + /* 80BE9984 */ void draw(); + /* 80BE99B8 */ bool _delete(); + +private: + /* 0x568 */ u8 field_0x568[0x974 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjFPillar_c) == 0x974); + #endif /* D_A_OBJ_FIREPILLAR_H */ diff --git a/include/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2.h b/include/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2.h index e438b92892a..689f8febfdf 100644 --- a/include/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2.h +++ b/include/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2.h @@ -1,5 +1,38 @@ #ifndef D_A_OBJ_FIREPILLAR2_H #define D_A_OBJ_FIREPILLAR2_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjFPillar2_c + * @brief Lava Fire Pillar + * + * @details + * + */ +class daObjFPillar2_c : public fopAc_ac_c { +public: + /* 80BE9CD8 */ void initBaseMtx(); + /* 80BE9D5C */ void setBaseMtx(); + /* 80BE9DDC */ void Create(); + /* 80BEA034 */ void CreateHeap(); + /* 80BEA228 */ void create(); + /* 80BEA584 */ void execute(); + /* 80BEA734 */ void action(); + /* 80BEA808 */ void actionOffInit(); + /* 80BEA854 */ void actionOff(); + /* 80BEA98C */ void actionOnWaitInit(); + /* 80BEAAE4 */ void actionOnWait(); + /* 80BEAC68 */ void actionOnInit(); + /* 80BEADD0 */ void actionOn(); + /* 80BEB1B4 */ void draw(); + /* 80BEB278 */ void _delete(); + +private: + /* 0x568 */ u8 field_0x568[0x9ec - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjFPillar2_c) == 0x9ec); + #endif /* D_A_OBJ_FIREPILLAR2_H */ diff --git a/include/rel/d/a/obj/d_a_obj_flag/d_a_obj_flag.h b/include/rel/d/a/obj/d_a_obj_flag/d_a_obj_flag.h index fbdd520c42b..f45aac605d1 100644 --- a/include/rel/d/a/obj/d_a_obj_flag/d_a_obj_flag.h +++ b/include/rel/d/a/obj/d_a_obj_flag/d_a_obj_flag.h @@ -1,6 +1,38 @@ #ifndef D_A_OBJ_FLAG_H #define D_A_OBJ_FLAG_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +class FlagJoint_c { +public: + /* 80BEC3BC */ ~FlagJoint_c(); + /* 80BEC4E0 */ FlagJoint_c(); +}; + +/** + * @ingroup actors-objects + * @class daObjFlag_c + * @brief Flag 1 + * + * @details + * + */ +class daObjFlag_c : public fopAc_ac_c { +public: + /* 80BEB778 */ void create_init(); + /* 80BEB8F0 */ void initBaseMtx(); + /* 80BEB984 */ void getJointAngle(csXyz*, int); + /* 80BEB9AC */ void calcJointAngle(); + /* 80BEBC58 */ void calcAngleSwingZ(FlagJoint_c*, f32); + /* 80BEBDAC */ void calcAngleSwingX(FlagJoint_c*, f32); + /* 80BEBE64 */ void getSwingY(f32); + + static u8 const M_attr[52]; + +private: + /* 0x568 */ u8 field_0x568[0x5ec - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjFlag_c) == 0x5ec); + #endif /* D_A_OBJ_FLAG_H */ diff --git a/include/rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.h b/include/rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.h index 0464efc9f50..69cfbbed7f5 100644 --- a/include/rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.h +++ b/include/rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.h @@ -1,5 +1,49 @@ #ifndef D_A_OBJ_FLAG2_H #define D_A_OBJ_FLAG2_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjFlag2_c + * @brief Flag 2 + * + * @details + * + */ +class daObjFlag2_c : public fopAc_ac_c { +public: + /* 80BED22C */ void create_init(); + /* 80BED368 */ void initBaseMtx(); + /* 80BED3B8 */ void initCollision(); + /* 80BED44C */ void setCollision(); + /* 80BED480 */ void createHeap(); + /* 80BED6A0 */ void create(); + /* 80BED7A4 */ daObjFlag2_c(); + /* 80BEDCE0 */ void draw(); + /* 80BEDEE0 */ ~daObjFlag2_c(); + + static u8 const M_attr[20]; + +private: + /* 0x568 */ u8 field_0x568[0x10c0 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjFlag2_c) == 0x10c0); + +class FlagCloth_c { +public: + /* 80BEC658 */ void initFlagPos(cXyz*, fopAc_ac_c*); + /* 80BEC7CC */ void calcFlagFactor(cXyz*, cXyz*, cXyz*, int); + /* 80BEC928 */ void calcFlagFactorSub(cXyz*, cXyz*, cXyz*, f32); + /* 80BECAE0 */ void calcFlagNormal(cXyz*, int); + /* 80BECC34 */ void calcFlagNormalBack(); + /* 80BECC78 */ void initCcSphere(fopAc_ac_c*); + /* 80BECCE4 */ void setCcSphere(); + /* 80BECD98 */ void execute(); + /* 80BECF30 */ void draw(); + /* 80BED9C4 */ ~FlagCloth_c(); + /* 80BEE0B8 */ void getTargetPos(); +}; + #endif /* D_A_OBJ_FLAG2_H */ diff --git a/include/rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3.h b/include/rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3.h index 53cbda8ffc4..266f20d29dc 100644 --- a/include/rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3.h +++ b/include/rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3.h @@ -1,6 +1,41 @@ #ifndef D_A_OBJ_FLAG3_H #define D_A_OBJ_FLAG3_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjFlag3_c + * @brief Flag 3 + * + * @details + * + */ +class daObjFlag3_c : public fopAc_ac_c { +public: + /* 80BEEA78 */ void createHeap(); + /* 80BEED3C */ void execute(); + /* 80BEF700 */ ~daObjFlag3_c(); + /* 80BEF95C */ void create(); + /* 80BEFBC4 */ void create_init(); + + static u8 const M_attr[20]; + +private: + /* 0x568 */ u8 field_0x568[0x1340 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjFlag3_c) == 0x1340); + +class FlagCloth2_c { +public: + /* 80BEEDE4 */ void execute(); + /* 80BEEF74 */ void calcFlagNormal(cXyz*, int); + /* 80BEF278 */ void calcFlagFactor(cXyz*, cXyz*, cXyz*, int); + /* 80BEF790 */ ~FlagCloth2_c(); + /* 80BEFD08 */ void initFlagPos(cXyz*, fopAc_ac_c*); + /* 80BF00A0 */ void draw(); + /* 80BF0434 */ void getTargetPos(); +}; + #endif /* D_A_OBJ_FLAG3_H */ diff --git a/include/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.h b/include/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.h index 18474ac3832..6d900bffb5a 100644 --- a/include/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.h +++ b/include/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.h @@ -5,6 +5,14 @@ class dBgW; +/** + * @ingroup actors-objects + * @class obj_fmobj_class + * @brief Fyrus Object? + * + * @details + * + */ class obj_fmobj_class : public fopAc_ac_c { public: /* 0x568 */ request_of_phase_process_class mPhase; diff --git a/include/rel/d/a/obj/d_a_obj_food/d_a_obj_food.h b/include/rel/d/a/obj/d_a_obj_food/d_a_obj_food.h index 5b05e509998..f966748fd0b 100644 --- a/include/rel/d/a/obj/d_a_obj_food/d_a_obj_food.h +++ b/include/rel/d/a/obj/d_a_obj_food/d_a_obj_food.h @@ -6,6 +6,14 @@ #include "d/cc/d_cc_d.h" #include "f_op/f_op_actor.h" +/** + * @ingroup actors-objects + * @class obj_food_class + * @brief Dog Bone + * + * @details + * + */ class obj_food_class : public fopAc_ac_c { public: enum Type { diff --git a/include/rel/d/a/obj/d_a_obj_fw/d_a_obj_fw.h b/include/rel/d/a/obj/d_a_obj_fw/d_a_obj_fw.h index 81febd44a11..04857b3e25a 100644 --- a/include/rel/d/a/obj/d_a_obj_fw/d_a_obj_fw.h +++ b/include/rel/d/a/obj/d_a_obj_fw/d_a_obj_fw.h @@ -1,6 +1,27 @@ #ifndef D_A_OBJ_FW_H #define D_A_OBJ_FW_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class obj_fw_class + * @brief Firewood + * + * @details + * + */ +class obj_fw_class : public fopAc_ac_c { +private: + /* 0x568 */ u8 field_0x568[0x628 - 0x568]; +}; +STATIC_ASSERT(sizeof(obj_fw_class) == 0x628); + +class daObj_Fw_HIO_c { +public: + /* 80BF204C */ daObj_Fw_HIO_c(); + /* 80BF2AB0 */ ~daObj_Fw_HIO_c(); +}; + #endif /* D_A_OBJ_FW_H */ diff --git a/include/rel/d/a/obj/d_a_obj_gadget/d_a_obj_gadget.h b/include/rel/d/a/obj/d_a_obj_gadget/d_a_obj_gadget.h index 48d8d6cb4db..9aa9a7ae0c7 100644 --- a/include/rel/d/a/obj/d_a_obj_gadget/d_a_obj_gadget.h +++ b/include/rel/d/a/obj/d_a_obj_gadget/d_a_obj_gadget.h @@ -1,5 +1,46 @@ #ifndef D_A_OBJ_GADGET_H #define D_A_OBJ_GADGET_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObj_Gadget_c + * @brief Gadget + * + * @details + * + */ +class daObj_Gadget_c : public fopAc_ac_c { +public: + /* 80BF2D2C */ ~daObj_Gadget_c(); + /* 80BF2F28 */ void create(); + /* 80BF3478 */ void CreateHeap(); + /* 80BF3504 */ void Delete(); + /* 80BF3538 */ void Execute(); + /* 80BF3FAC */ void Draw(); + /* 80BF4130 */ void createHeapCallBack(fopAc_ac_c*); + /* 80BF4150 */ void setEnvTevColor(); + /* 80BF41AC */ void setRoomNo(); + /* 80BF41F0 */ void reset(); + /* 80BF424C */ void setMtx(); + /* 80BF4354 */ void calcRollAngle(s16, int); + /* 80BF43F4 */ void getWallAngle(s16, s16*); + /* 80BF4584 */ void setSmokePrtcl(); + /* 80BF4600 */ void setWaterPrtcl(); + /* 80BF4728 */ void setHamonPrtcl(); + +private: + /* 0x568 */ u8 field_0x568[0xa4c - 0x568]; +}; +STATIC_ASSERT(sizeof(daObj_Gadget_c) == 0xa4c); + +class daObj_Gadget_Param_c { +public: + /* 80BF48D8 */ ~daObj_Gadget_Param_c(); + + static u8 const m[44]; +}; + #endif /* D_A_OBJ_GADGET_H */ diff --git a/include/rel/d/a/obj/d_a_obj_ganonwall/d_a_obj_ganonwall.h b/include/rel/d/a/obj/d_a_obj_ganonwall/d_a_obj_ganonwall.h index 861155616ba..642351ce580 100644 --- a/include/rel/d/a/obj/d_a_obj_ganonwall/d_a_obj_ganonwall.h +++ b/include/rel/d/a/obj/d_a_obj_ganonwall/d_a_obj_ganonwall.h @@ -2,5 +2,40 @@ #define D_A_OBJ_GANONWALL_H #include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjGWall_c + * @brief Gannon Wall + * + * @details + * + */ +class daObjGWall_c : public fopAc_ac_c { +public: + /* 80BF4D18 */ void initBaseMtx(); + /* 80BF4D54 */ void setBaseMtx(); + /* 80BF4DA8 */ int Create(); + /* 80BF4E8C */ int CreateHeap(); + /* 80BF4FF0 */ int create(); + /* 80BF50A4 */ int execute(); + /* 80BF50CC */ int checkDraw(); + /* 80BF5168 */ int draw(); + /* 80BF5530 */ int _delete(); + + u32 getEventBit1() { return fopAcM_GetParamBit(this, 0, 10); } + u32 getEventBit2() { return fopAcM_GetParamBit(this, 10, 10); } + +private: + /* 0x568 */ request_of_phase_process_class mPhaseReq; + /* 0x570 */ J3DModel* mpModel; + /* 0x574 */ mDoExt_btkAnm* mpBtkAnm; + /* 0x578 */ u16 field_0x578; + /* 0x57A */ u16 field_0x57a; + /* 0x57C */ s16 field_0x57c; +}; +STATIC_ASSERT(sizeof(daObjGWall_c) == 0x580); + #endif /* D_A_OBJ_GANONWALL_H */ diff --git a/include/rel/d/a/obj/d_a_obj_ganonwall2/d_a_obj_ganonwall2.h b/include/rel/d/a/obj/d_a_obj_ganonwall2/d_a_obj_ganonwall2.h index 686fef963db..964280c9faf 100644 --- a/include/rel/d/a/obj/d_a_obj_ganonwall2/d_a_obj_ganonwall2.h +++ b/include/rel/d/a/obj/d_a_obj_ganonwall2/d_a_obj_ganonwall2.h @@ -1,6 +1,31 @@ #ifndef D_A_OBJ_GANONWALL2_H #define D_A_OBJ_GANONWALL2_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjGWall2_c + * @brief Ganon Wall 2 + * + * @details + * + */ +class daObjGWall2_c : public fopAc_ac_c { +public: + /* 80BF57D8 */ void initBaseMtx(); + /* 80BF5814 */ void setBaseMtx(); + /* 80BF5878 */ void Create(); + /* 80BF5950 */ void CreateHeap(); + /* 80BF5AB4 */ void create1st(); + /* 80BF5B74 */ void Execute(f32 (**)[3][4]); + /* 80BF5C0C */ void Draw(); + /* 80BF6004 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x5c0 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjGWall2_c) == 0x5c0); + #endif /* D_A_OBJ_GANONWALL2_H */ diff --git a/include/rel/d/a/obj/d_a_obj_gb/d_a_obj_gb.h b/include/rel/d/a/obj/d_a_obj_gb/d_a_obj_gb.h index f102421013f..3f9533b6bea 100644 --- a/include/rel/d/a/obj/d_a_obj_gb/d_a_obj_gb.h +++ b/include/rel/d/a/obj/d_a_obj_gb/d_a_obj_gb.h @@ -1,6 +1,21 @@ #ifndef D_A_OBJ_GB_H #define D_A_OBJ_GB_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class obj_gb_class + * @brief Ganondorf Barrier + * + * @details + * + */ +class obj_gb_class : public fopAc_ac_c { +private: + /* 0x568 */ u8 field_0x568[0x6bc - 0x568]; +}; +STATIC_ASSERT(sizeof(obj_gb_class) == 0x6bc); + #endif /* D_A_OBJ_GB_H */ diff --git a/include/rel/d/a/obj/d_a_obj_geyser/d_a_obj_geyser.h b/include/rel/d/a/obj/d_a_obj_geyser/d_a_obj_geyser.h index 92be3b93a37..393f464bdba 100644 --- a/include/rel/d/a/obj/d_a_obj_geyser/d_a_obj_geyser.h +++ b/include/rel/d/a/obj/d_a_obj_geyser/d_a_obj_geyser.h @@ -1,5 +1,61 @@ #ifndef D_A_OBJ_GEYSER_H #define D_A_OBJ_GEYSER_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjGeyser_c + * @brief Geyser + * + * @details + * + */ +class daObjGeyser_c : public fopAc_ac_c { +public: + /* 80BF6F18 */ void initBaseMtx(); + /* 80BF6F38 */ void setBaseMtx(); + /* 80BF6F80 */ void Create(); + /* 80BF70E0 */ void CreateHeap(); + /* 80BF7174 */ void create1st(); + /* 80BF7288 */ void Execute(f32 (**)[3][4]); + /* 80BF744C */ void action(); + /* 80BF75B8 */ void actionOff2Init(); + /* 80BF75C4 */ void actionOff2(); + /* 80BF7838 */ void actionOnWait2Init(); + /* 80BF787C */ void actionOnWait2(); + /* 80BF7C54 */ void actionOn2Init(); + /* 80BF7CA0 */ void actionOn2(); + /* 80BF8158 */ void actionDisappearInit(u8); + /* 80BF8178 */ void actionDisappear(); + /* 80BF823C */ void actionOffInit(); + /* 80BF8268 */ void actionOff(); + /* 80BF82D0 */ void actionOnWaitInit(); + /* 80BF8344 */ void actionOnWait(); + /* 80BF83E4 */ void actionOnInit(); + /* 80BF846C */ void actionOn(); + /* 80BF8584 */ void setPntWind(); + /* 80BF863C */ void cutPntWind(); + /* 80BF8660 */ void movePntWind(); + /* 80BF8870 */ void Draw(); + /* 80BF8914 */ void setEmitterPre00(); + /* 80BF89AC */ void setEmitterSrc00Sand(); + /* 80BF89B0 */ void setEmitterSrc01Smk(); + /* 80BF8A54 */ void stopEmitterPre00(); + /* 80BF8A80 */ void stopEmitterSrc00Sand(); + /* 80BF8AAC */ void stopEmitterSrc01Smk(); + /* 80BF8AD8 */ void setEmitterClm00(); + /* 80BF8B70 */ void setEmitterSmk01(); + /* 80BF8C08 */ void setEmitterSmk02(); + /* 80BF8CA0 */ void stopEmitterClm00(); + /* 80BF8CCC */ void stopEmitterSmk01(); + /* 80BF8CF8 */ void stopEmitterSmk02(); + /* 80BF8D24 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x7f0 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjGeyser_c) == 0x7f0); + #endif /* D_A_OBJ_GEYSER_H */ diff --git a/include/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere.h b/include/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere.h index 2bd4602139c..ea75fa3fe8f 100644 --- a/include/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere.h +++ b/include/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere.h @@ -1,6 +1,71 @@ #ifndef D_A_OBJ_GLOWSPHERE_H #define D_A_OBJ_GLOWSPHERE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daGlwSph_c + * @brief STAR Game Glow Sphere + * + * @details + * + */ +class daGlwSph_c : public fopAc_ac_c { +public: + /* 80BF9430 */ void getSphMng(); + /* 80BF943C */ void setBaseMtx(); + /* 80BF94AC */ void createHeapCallBack(fopAc_ac_c*); + /* 80BF94CC */ void CreateHeap(); + /* 80BF95D4 */ void create(); + /* 80BF9B1C */ void execute(); + /* 80BF9BC0 */ void actionMain(); + /* 80BF9DF0 */ void effectSet(); + /* 80BF9F30 */ void getSE(); + /* 80BFA010 */ void getVibe(); + /* 80BFA064 */ void actionWaitInit(); + /* 80BFA070 */ void actionWait(); + /* 80BFA074 */ void actionGetInit(); + /* 80BFA130 */ void actionGet(); + /* 80BFA1E0 */ void actionMoveInit(); + /* 80BFA204 */ void actionMove(); + /* 80BFA2A4 */ void draw(); + /* 80BFA3EC */ void _delete(); + + static u8 const mCcDObjInfo[48]; + static u8 mCcDSph[64]; + static u8 mSphMng[964]; + +private: + /* 0x568 */ u8 field_0x568[0x98c - 0x568]; +}; +STATIC_ASSERT(sizeof(daGlwSph_c) == 0x98C); + +class daGlwSph_HIO_c { +public: + /* 80BF934C */ daGlwSph_HIO_c(); + /* 80BFA76C */ ~daGlwSph_HIO_c(); +}; + +class _GlSph_Mng_c { +public: + /* 80BFA4B8 */ void _clrLstBuf(); + /* 80BFA4DC */ void entry(daGlwSph_c*); + /* 80BFA528 */ void remove(daGlwSph_c*); + /* 80BFA55C */ void _setting_main(); + /* 80BFA5C4 */ void _chkAllGet_main(); + /* 80BFA60C */ void SphSeProc(); + /* 80BFA6D8 */ void clrSphSe(); + /* 80BFA6E8 */ void getSphSe(); + /* 80BFA6F8 */ void incSphSe(); + /* 80BFA890 */ ~_GlSph_Mng_c(); +}; + +class _GlSph_LstInfo_c{ +public: + /* 80BFA900 */ ~_GlSph_LstInfo_c(); + /* 80BFA93C */ _GlSph_LstInfo_c(); +}; + #endif /* D_A_OBJ_GLOWSPHERE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_gm/d_a_obj_gm.h b/include/rel/d/a/obj/d_a_obj_gm/d_a_obj_gm.h index 3241dddc0fc..78b941c25fa 100644 --- a/include/rel/d/a/obj/d_a_obj_gm/d_a_obj_gm.h +++ b/include/rel/d/a/obj/d_a_obj_gm/d_a_obj_gm.h @@ -1,5 +1,33 @@ #ifndef D_A_OBJ_GM_H #define D_A_OBJ_GM_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class obj_gm_class + * @brief Gohma Egg Container + * + * @details + * + */ +class obj_gm_class : public fopAc_ac_c { +private: + /* 0x568 */ u8 field_0x568[0xaf4 - 0x568]; +}; +STATIC_ASSERT(sizeof(obj_gm_class) == 0xaf4); + +class daObj_Gm_HIO_c { +public: + /* 80BFB14C */ daObj_Gm_HIO_c(); + /* 80BFD284 */ ~daObj_Gm_HIO_c(); +}; + +struct daObj { +public: + /* 800372A0 */ void make_eff_break_gm_kotubo(fopAc_ac_c*); + /* 80037330 */ void make_eff_break_gm_ootubo(fopAc_ac_c*); +}; + #endif /* D_A_OBJ_GM_H */ diff --git a/include/rel/d/a/obj/d_a_obj_goGate/d_a_obj_goGate.h b/include/rel/d/a/obj/d_a_obj_goGate/d_a_obj_goGate.h index a82777a5571..827e2330d55 100644 --- a/include/rel/d/a/obj/d_a_obj_goGate/d_a_obj_goGate.h +++ b/include/rel/d/a/obj/d_a_obj_goGate/d_a_obj_goGate.h @@ -1,6 +1,43 @@ #ifndef D_A_OBJ_GOGATE_H #define D_A_OBJ_GOGATE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daGoGate_c + * @brief Goron Gate + * + * @details + * + */ +class daGoGate_c : public fopAc_ac_c { +public: + /* 80BFD724 */ void setBaseMtx(); + /* 80BFD7C0 */ void CreateHeap(); + /* 80BFD82C */ void create(); + /* 80BFD984 */ void Execute(f32 (**)[3][4]); + /* 80BFD9D4 */ void moveGate(); + /* 80BFDAD8 */ void init_modeWait(); + /* 80BFDAE4 */ void modeWait(); + /* 80BFDAE8 */ void init_modeMoveOpen(); + /* 80BFDAF4 */ void modeMoveOpen(); + /* 80BFDC04 */ void init_modeMoveClose(); + /* 80BFDC10 */ void modeMoveClose(); + /* 80BFDD20 */ void setSe(); + /* 80BFDDDC */ void Draw(); + /* 80BFDE80 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x5b8 - 0x568]; +}; +STATIC_ASSERT(sizeof(daGoGate_c) == 0x5b8); + +class daGoGate_HIO_c { +public: + /* 80BFD6AC */ daGoGate_HIO_c(); + /* 80BFDF3C */ ~daGoGate_HIO_c(); +}; + #endif /* D_A_OBJ_GOGATE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_gomikabe/d_a_obj_gomikabe.h b/include/rel/d/a/obj/d_a_obj_gomikabe/d_a_obj_gomikabe.h index 110f5c6daee..afe8b99c22b 100644 --- a/include/rel/d/a/obj/d_a_obj_gomikabe/d_a_obj_gomikabe.h +++ b/include/rel/d/a/obj/d_a_obj_gomikabe/d_a_obj_gomikabe.h @@ -1,5 +1,48 @@ #ifndef D_A_OBJ_GOMIKABE_H #define D_A_OBJ_GOMIKABE_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjGOMIKABE_c + * @brief Garbage Wall + * + * @details + * + */ +class daObjGOMIKABE_c : public fopAc_ac_c { +public: + /* 80BFE244 */ void initCcCylinder(); + /* 80BFE2CC */ void SetCcCyl(); + /* 80BFE47C */ void WaitAction(); + /* 80BFE4C4 */ void BreakChk(); + /* 80BFE52C */ void BreakSet(); + /* 80BFEA60 */ void getWaterStream(cXyz&, cXyz&, f32); + /* 80BFEB90 */ void SpeedSet(); + /* 80BFED54 */ void BreakAction(); + /* 80BFED74 */ void CheckCull(); + /* 80BFEE24 */ void checkViewArea(cXyz); + /* 80BFEEA8 */ void Action(); + /* 80BFEF20 */ void setBaseMtx(); + /* 80BFEF84 */ void setBaseMtx2(); + /* 80BFF064 */ void CreateHeap(); + /* 80BFF164 */ void create(); + /* 80BFF8D8 */ void Create(); + /* 80BFF938 */ void Execute(f32 (**)[3][4]); + /* 80BFFA00 */ void Draw(); + /* 80BFFB1C */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x13c4 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjGOMIKABE_c) == 0x13c4); + +class daObjGOMIKABE_HIO_c { +public: + /* 80BFE22C */ daObjGOMIKABE_HIO_c(); + /* 80BFFB74 */ ~daObjGOMIKABE_HIO_c(); +}; + #endif /* D_A_OBJ_GOMIKABE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_gpTaru/d_a_obj_gpTaru.h b/include/rel/d/a/obj/d_a_obj_gpTaru/d_a_obj_gpTaru.h index 18b06f846e1..706f1e0f910 100644 --- a/include/rel/d/a/obj/d_a_obj_gpTaru/d_a_obj_gpTaru.h +++ b/include/rel/d/a/obj/d_a_obj_gpTaru/d_a_obj_gpTaru.h @@ -1,6 +1,58 @@ #ifndef D_A_OBJ_GPTARU_H #define D_A_OBJ_GPTARU_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daGpTaru_c + * @brief Gunpowder Barrel + * + * @details + * + */ +class daGpTaru_c : public fopAc_ac_c { +public: + /* 8057D1F8 */ void setBaseMtx(); + /* 8057D2D0 */ void CreateHeap(); + /* 8057D33C */ void create(); + /* 8057D7CC */ void createHeapCallBack(fopAc_ac_c*); + /* 8057DB3C */ void chkSinkAll(); + /* 8057DB60 */ void chkWaterLineIn(); + /* 8057DB84 */ void bgCheck(); + /* 8057E224 */ void Execute(); + /* 8057E494 */ void mode_proc_call(); + /* 8057E5DC */ void mode_init_wait(); + /* 8057E618 */ void mode_proc_wait(); + /* 8057E63C */ void mode_init_carry(); + /* 8057E660 */ void mode_proc_carry(); + /* 8057E700 */ void mode_init_drop(); + /* 8057E72C */ void mode_proc_drop(); + /* 8057E750 */ void mode_init_roll(); + /* 8057E768 */ void mode_proc_roll(); + /* 8057EBA4 */ void mode_init_exploInit(); + /* 8057EC60 */ void mode_proc_exploInit(); + /* 8057EE2C */ void mode_init_explosion(); + /* 8057EFB0 */ void mode_proc_explosion(); + /* 8057EFFC */ void mode_init_sink(); + /* 8057F014 */ void mode_proc_sink(); + /* 8057F104 */ void breakEffSet(); + /* 8057F284 */ void Draw(); + /* 8057F328 */ void Delete(); + + static u8 const mCcDObjInfo[48]; + static u8 mCcDCyl[68]; + +private: + /* 0x568 */ u8 field_0x568[0x9ac - 0x568]; +}; +STATIC_ASSERT(sizeof(daGpTaru_c) == 0x9ac); + +class daGpTaru_HIO_c { +public: + /* 8057D0CC */ daGpTaru_HIO_c(); + /* 8057F458 */ ~daGpTaru_HIO_c(); +}; + #endif /* D_A_OBJ_GPTARU_H */ diff --git a/include/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.h b/include/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.h index 39b7c494066..daa020e3c0f 100644 --- a/include/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.h +++ b/include/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.h @@ -1,6 +1,166 @@ #ifndef D_A_OBJ_GRA2_H #define D_A_OBJ_GRA2_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObj_GrA_c + * @brief Goron A + * + * @details + * + */ +class daObj_GrA_c : public fopAc_ac_c { +public: + class daObj_GrA_prtclMngr_c { + public: + /* 80C04E14 */ ~daObj_GrA_prtclMngr_c(); + /* 80C04E50 */ daObj_GrA_prtclMngr_c(); + }; + + /* 80BFFF58 */ void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*); + /* 80BFFF70 */ daObj_GrA_c(); + /* 80C0011C */ ~daObj_GrA_c(); + /* 80C003CC */ void create(); + /* 80C00614 */ void CreateHeap(); + /* 80C00790 */ void Delete(); + /* 80C00804 */ void Execute(f32 (**)[3][4]); + /* 80C00A44 */ void Draw(); + /* 80C00ACC */ void jointCtrl(J3DJoint*, J3DModel*); + /* 80C00D5C */ void getResName(); + /* 80C00D74 */ void getMode(); + /* 80C00DF8 */ void getPathNo(); + /* 80C00E04 */ void getTagNo(); + /* 80C00E10 */ void getJumpType(); + /* 80C00E1C */ void isDelete(); + /* 80C00EFC */ void restart(); + /* 80C010D4 */ void init(); + /* 80C013B0 */ void setBaseAnm(int, f32); + /* 80C014F4 */ void setFaceAnm(int, bool, f32); + /* 80C01698 */ void setFaceBtp(int); + /* 80C0178C */ void setBaseMotion(int, f32); + /* 80C017AC */ void setFaceMotion(int, f32); + /* 80C017F0 */ void calcMotion(); + /* 80C018C0 */ void checkProcess(int (daObj_GrA_c::*)(void*)); + /* 80C018F4 */ void setProcess(int (daObj_GrA_c::*)(void*)); + /* 80C019B8 */ void setParam(); + /* 80C01C18 */ void checkEvent(); + /* 80C01D7C */ void mainProc(); + /* 80C01FE4 */ void adjustShapeAngle(); + /* 80C01FE8 */ void setMtx(int); + /* 80C02614 */ void setCollisions(); + /* 80C02970 */ void setAttnPos(); + /* 80C02A5C */ void drawOtherMdls(); + /* 80C02A60 */ bool dbgDraw(); + /* 80C02A68 */ void ppMoveInit(); + /* 80C02AD4 */ void setLookMode(int); + /* 80C02AE8 */ void lookat(); + /* 80C0308C */ void hitChk(); + /* 80C031E4 */ void wait(void*); + /* 80C0335C */ void talk(void*); + /* 80C035B8 */ void ctrlMsgAnm(int&, int&, fopAc_ac_c*); + /* 80C03720 */ void checkTagGraSub(fopAc_ac_c*); + /* 80C03764 */ void fallAbyssCheck(); + /* 80C03830 */ void setPrtcl(); + /* 80C03B14 */ void base000(int); + /* 80C03B48 */ void base001(int); + /* 80C03B7C */ void base003(int); + /* 80C03C1C */ void base004(int); + /* 80C03CBC */ void base005(int); + /* 80C03D54 */ void base006(int); + /* 80C03D88 */ void base007(int); + /* 80C03DF0 */ void base008(int); + /* 80C03E74 */ void base009(int); + /* 80C03F14 */ void base010(int); + /* 80C03FC0 */ void base013(int); + /* 80C04118 */ void base016(int); + /* 80C04180 */ void base017(int); + /* 80C041E8 */ void base018(int); + /* 80C04260 */ void base019(int); + /* 80C042D4 */ void base020(int); + /* 80C04308 */ void base021(int); + /* 80C0433C */ void base022(int); + /* 80C04370 */ void base023(int); + /* 80C043A4 */ void base024(int); + /* 80C043D8 */ void base025(int); + /* 80C0440C */ void base026(int); + /* 80C04440 */ void face000(int); + /* 80C04478 */ void face003(int); + /* 80C04518 */ void face004(int); + /* 80C045B8 */ void face005(int); + /* 80C045F0 */ void face006(int); + /* 80C04628 */ void face007(int); + /* 80C04660 */ void face008(int); + /* 80C04700 */ void face009(int); + /* 80C047A0 */ void face010(int); + /* 80C047D8 */ void face011(int); + /* 80C04810 */ void face012(int); + /* 80C04848 */ void face016(int); + /* 80C04880 */ void face017(int); + /* 80C048B8 */ void face999(int); + /* 80C048F8 */ void evtcutTalk(int, int); + /* 80C04A0C */ void setFaceTalkAfter(); + /* 80C0536C */ void getSrchCircleR(); + /* 80C053C4 */ void standWait(void*); + /* 80C05920 */ void walk(void*); + /* 80C05F64 */ void defence(void*); + /* 80C061F4 */ void toStone(void*); + /* 80C067D8 */ void step(void*); + /* 80C06CDC */ void rollReturn(void*); + /* 80C0780C */ void soldierDemoSkip(); + /* 80C078A8 */ void soldierDemo(void*); + /* 80C07C40 */ void getSrchLinkR(); + /* 80C07C98 */ void getSrchGraR(); + /* 80C07CF0 */ void getSpeed(); + /* 80C07D38 */ void standRoll(void*); + /* 80C083F0 */ void rollDemo(void*); + /* 80C08804 */ void rollAttack(void*); + /* 80C09298 */ void rollAttacked(void*); + /* 80C09918 */ void rollEscape(void*); + /* 80C09F08 */ void rollLanding(); + /* 80C0A018 */ void thrown(void*); + /* 80C0A120 */ void demo_camera(); + /* 80C0AF94 */ void rollAttackedDemo(); + /* 80C0B9AC */ void graThrowDemo(); + /* 80C0BD90 */ void setCarryStatus(); + /* 80C0BE5C */ void checkThrow(); + /* 80C0BF34 */ void calcCatchPos(f32, int); + /* 80C0C348 */ void initCrazyBeforeCatch(int); + /* 80C0C364 */ void executeCrazyBeforeCatch(); + /* 80C0C3E0 */ void initCrazyCatch(int); + /* 80C0C478 */ void executeCrazyCatch(); + /* 80C0C5F0 */ void initCrazyThrow(int); + /* 80C0C690 */ void executeCrazyThrow(); + /* 80C0C84C */ void initCrazyAttack(); + /* 80C0CA64 */ void executeCrazyJumping(); + /* 80C0CDBC */ void modeChangeCheck(); + /* 80C0CF98 */ void checkGraSub(fopAc_ac_c*); + /* 80C0D000 */ void waitDemo(void*); + /* 80C0D2FC */ void skipDemoGra(); + /* 80C0D3E0 */ void startDemo(void*); + /* 80C0EFC4 */ void turn(s16, f32, int); + /* 80C0F17C */ void turn_step(s16, int, int, int); + /* 80C0F330 */ void chkFindPlayer2(int, s16); + /* 80C0F668 */ void chkPointInArea(cXyz, cXyz, cXyz, s16); + /* 80C0F5A4 */ void chkPointInArea(cXyz, cXyz, f32, f32, f32, s16); + /* 80C0F6E0 */ void chkActorInSight2(fopAc_ac_c*, f32, s16); + /* 80C0F7EC */ void getAttentionPos(fopAc_ac_c*); + /* 80C0F860 */ void standWaitJump(void*); + + static u8 mBaseMotionList[264]; + static u8 mFaceMotionList[168]; + +private: + /* 0x568 */ u8 field_0x568[0x20a4 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObj_GrA_c) == 0x20a4); + +class daObj_GrA_Param_c { +public: + /* 80C04B1C */ ~daObj_GrA_Param_c(); + + static u8 const m[192]; +}; #endif /* D_A_OBJ_GRA2_H */ diff --git a/include/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.h b/include/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.h index ffd623b44f6..92f6fb7a139 100644 --- a/include/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.h +++ b/include/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.h @@ -4,17 +4,27 @@ #include "d/com/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" +/** + * @ingroup actors-objects + * @class daObjGraWall_c + * @brief Goron Wall? + * + * @details + * + */ class daObjGraWall_c : public fopAc_ac_c { - public: +public: /* 80C10BF8 */ int Create(); /* 80C10DD8 */ int Execute(); /* 80C10E78 */ int Delete(); /* 80C10E80 */ void col_init(); /* 80C10ED4 */ void col_set(); +private: /* 0x568 */ dCcD_Stts mStts; /* 0x5A4 */ dCcD_Cyl mCyl; /* 0x6E0 */ u8 field_0x6e0; -}; // Size: 0x6E4 +}; +STATIC_ASSERT(sizeof(daObjGraWall_c) == 0x6E4); #endif /* D_A_OBJ_GRAWALL_H */ diff --git a/include/rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock.h b/include/rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock.h index 775f91092b9..c42f1197083 100644 --- a/include/rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock.h +++ b/include/rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock.h @@ -1,6 +1,40 @@ #ifndef D_A_OBJ_GRA_ROCK_H #define D_A_OBJ_GRA_ROCK_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "d/cc/d_cc_d.h" + +/** + * @ingroup actors-objects + * @class daObjGraRock_c + * @brief Goron Entombing Rock + * + * @details + * + */ +class daObjGraRock_c : public fopAc_ac_c { +public: + /* 80C110F8 */ void setAttnPos(); + /* 80C11444 */ void setBaseMtx(); + /* 80C114C0 */ void setPrtcl(); + /* 80C1157C */ void bombParticleSet(); + /* 80C11730 */ void setEnvTevColor(); + /* 80C1178C */ void setRoomNo(); + /* 80C117D0 */ void col_set(); + /* 80C11964 */ void checkHitAt(cCcD_Obj*); + /* 80C11970 */ void Create(); + /* 80C11B68 */ void CreateHeap(); + /* 80C11C64 */ void create(); + /* 80C11FF0 */ void Execute(f32 (**)[3][4]); + /* 80C120FC */ void Draw(); + /* 80C121C4 */ void Delete(); + + static u8 const mCcDCyl[68]; + +private: + /* 0x568 */ u8 field_0x568[0x9cc - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjGraRock_c) == 0x9cc); + #endif /* D_A_OBJ_GRA_ROCK_H */ diff --git a/include/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.h b/include/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.h index 749c444e513..167b332937e 100644 --- a/include/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.h +++ b/include/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.h @@ -5,6 +5,14 @@ #include "d/cc/d_cc_d.h" #include "d/particle/d_particle_copoly.h" +/** + * @ingroup actors-objects + * @class daGraveStone_c + * @brief Zora Gravestone + * + * @details + * + */ class daGraveStone_c : public dBgS_MoveBgActor { public: class daObj_GrvStn_prtclMngr_c { @@ -31,6 +39,7 @@ class daGraveStone_c : public dBgS_MoveBgActor { /* 80C13078 */ int Draw(); /* 80C1311C */ int Delete(); +private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ dBgS_ObjAcch mAcch; diff --git a/include/rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater.h b/include/rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater.h index 6fec5796aa2..719e1e871a7 100644 --- a/include/rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater.h +++ b/include/rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater.h @@ -1,6 +1,46 @@ #ifndef D_A_OBJ_GROUNDWATER_H #define D_A_OBJ_GROUNDWATER_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daGrdWater_c + * @brief Ground Water + * + * @details + * + */ +class daGrdWater_c : public fopAc_ac_c { +public: + /* 80C13540 */ void setBaseMtx(); + /* 80C13618 */ void CreateHeap(); + /* 80C139E4 */ void create(); + /* 80C13DB0 */ daGrdWater_c(); + /* 80C13FEC */ void Execute(f32 (**)[3][4]); + /* 80C14194 */ void init_modeWait(); + /* 80C141A0 */ void modeWait(); + /* 80C141A4 */ void init_modeLevelUpA(); + /* 80C1423C */ void modeLevelUpA(); + /* 80C142AC */ void init_modeLevelDownA(); + /* 80C14320 */ void modeLevelDownA(); + /* 80C1437C */ void init_modeLevelUpB(); + /* 80C14414 */ void modeLevelUpB(); + /* 80C14484 */ void init_modeLevelDownB(); + /* 80C144F8 */ void modeLevelDownB(); + /* 80C14554 */ void Draw(); + /* 80C147EC */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x6f4 - 0x568]; +}; +STATIC_ASSERT(sizeof(daGrdWater_c) == 0x6f4); + +class daGrdWater_HIO_c { +public: + /* 80C134AC */ daGrdWater_HIO_c(); + /* 80C148A8 */ ~daGrdWater_HIO_c(); +}; + #endif /* D_A_OBJ_GROUNDWATER_H */ diff --git a/include/rel/d/a/obj/d_a_obj_grz_rock/d_a_obj_grz_rock.h b/include/rel/d/a/obj/d_a_obj_grz_rock/d_a_obj_grz_rock.h index 34a7d0c3f70..2dc13e477ff 100644 --- a/include/rel/d/a/obj/d_a_obj_grz_rock/d_a_obj_grz_rock.h +++ b/include/rel/d/a/obj/d_a_obj_grz_rock/d_a_obj_grz_rock.h @@ -1,6 +1,33 @@ #ifndef D_A_OBJ_GRZ_ROCK_H #define D_A_OBJ_GRZ_ROCK_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjGrzRock_c + * @brief Hidden Village Rockslide + * + * @details + * + */ +class daObjGrzRock_c : public fopAc_ac_c { +public: + /* 80C14BD8 */ void setBaseMtx(); + /* 80C14C54 */ void setEnvTevColor(); + /* 80C14CB0 */ void setRoomNo(); + /* 80C14CF0 */ void setPrtcl(); + /* 80C14DA0 */ void Create(); + /* 80C14EE0 */ void CreateHeap(); + /* 80C14F50 */ void create(); + /* 80C1514C */ void Execute(f32 (**)[3][4]); + /* 80C151A4 */ void Draw(); + /* 80C15248 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x804 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjGrzRock_c) == 0x804); + #endif /* D_A_OBJ_GRZ_ROCK_H */ diff --git a/include/rel/d/a/obj/d_a_obj_h_saku/d_a_obj_h_saku.h b/include/rel/d/a/obj/d_a_obj_h_saku/d_a_obj_h_saku.h index e9876719853..8a736f890a5 100644 --- a/include/rel/d/a/obj/d_a_obj_h_saku/d_a_obj_h_saku.h +++ b/include/rel/d/a/obj/d_a_obj_h_saku/d_a_obj_h_saku.h @@ -1,6 +1,33 @@ #ifndef D_A_OBJ_H_SAKU_H #define D_A_OBJ_H_SAKU_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjH_Saku_c + * @brief H - Fence + * + * @details + * + */ +class daObjH_Saku_c : public fopAc_ac_c { +public: + /* 80C1552C */ void BreakSet(); + /* 80C15810 */ void SpeedSet(cXyz*, cXyz*, f32); + /* 80C15A4C */ void Action(); + /* 80C15E00 */ void initBaseMtx(); + /* 80C15E44 */ void setBaseMtx(); + /* 80C161E8 */ void CreateHeap(); + /* 80C1629C */ void Create(); + /* 80C162F4 */ void Execute(f32 (**)[3][4]); + /* 80C16340 */ void Draw(); + /* 80C1641C */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x850 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjH_Saku_c) == 0x850); + #endif /* D_A_OBJ_H_SAKU_H */ diff --git a/include/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.h b/include/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.h index a8ac29ec894..34a1aded88d 100644 --- a/include/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.h +++ b/include/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.h @@ -1,6 +1,36 @@ #ifndef D_A_OBJ_HAKAI_BRL_H #define D_A_OBJ_HAKAI_BRL_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjHBarrel_c + * @brief Destructable Barrel + * + * @details + * + */ +class daObjHBarrel_c : public fopAc_ac_c { +public: + /* 80C16758 */ daObjHBarrel_c(); + /* 80C16918 */ ~daObjHBarrel_c(); + /* 80C16A98 */ void createHeap(); + /* 80C16B08 */ void create(); + /* 80C16BF8 */ void Delete(); + /* 80C16C44 */ void draw(); + /* 80C16CA8 */ void execute(); + /* 80C16D50 */ void init(); + /* 80C16DEC */ void setModelMtx(); + /* 80C16E50 */ void hitAction(); + /* 80C17090 */ void callEmt(); + + static u8 const s_CcDCyl[68]; + +private: + /* 0x568 */ u8 field_0x568[0x710 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjHBarrel_c) == 0x710); + #endif /* D_A_OBJ_HAKAI_BRL_H */ diff --git a/include/rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr.h b/include/rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr.h index 000c9ae0241..87b7ed8db42 100644 --- a/include/rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr.h +++ b/include/rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr.h @@ -1,6 +1,36 @@ #ifndef D_A_OBJ_HAKAI_FTR_H #define D_A_OBJ_HAKAI_FTR_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjHFtr_c + * @brief Destruction Furniture + * + * @details + * + */ +class daObjHFtr_c : public fopAc_ac_c { +public: + /* 80C174B8 */ daObjHFtr_c(); + /* 80C17778 */ ~daObjHFtr_c(); + /* 80C17874 */ void createHeap(); + /* 80C179B0 */ void create(); + /* 80C17AC0 */ void Delete(); + /* 80C17B30 */ void draw(); + /* 80C17BD4 */ void execute(); + /* 80C17CD0 */ void init(); + /* 80C17E10 */ void setModelMtx(); + /* 80C17E74 */ void chkHit(); + /* 80C17EDC */ void callEmt(); + + static u8 const s_CcDCyl[68]; + +private: + /* 0x568 */ u8 field_0x568[0x860 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjHFtr_c) == 0x860); + #endif /* D_A_OBJ_HAKAI_FTR_H */ diff --git a/include/rel/d/a/obj/d_a_obj_hasu2/d_a_obj_hasu2.h b/include/rel/d/a/obj/d_a_obj_hasu2/d_a_obj_hasu2.h index 32b3591ceb0..5806c882249 100644 --- a/include/rel/d/a/obj/d_a_obj_hasu2/d_a_obj_hasu2.h +++ b/include/rel/d/a/obj/d_a_obj_hasu2/d_a_obj_hasu2.h @@ -1,6 +1,37 @@ #ifndef D_A_OBJ_HASU2_H #define D_A_OBJ_HASU2_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +namespace nObjMHasu { +/** + * @ingroup actors-objects + * @class daObjMHasu_c + * @brief Lily Pad? + * + * @details + * + */ +class daObjMHasu_c : public fopAc_ac_c { +public: + /* 80C182DC */ daObjMHasu_c(); + /* 80C18340 */ void create1st(); + /* 80C183D0 */ void setMtx(); + /* 80C18440 */ void CreateHeap(); + /* 80C184B0 */ void Create(); + /* 80C185A4 */ void Execute(f32 (**)[3][4]); + /* 80C18600 */ void Draw(); + /* 80C186A4 */ void Delete(); + /* 80C186E0 */ void upDownHasu(); + /* 80C18888 */ void updateCount(u8); + /* 80C188A0 */ void setHasuCount(f32); + /* 80C189E0 */ ~daObjMHasu_c(); + +private: + /* 0x568 */ u8 field_0x568[0x634 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjMHasu_c) == 0x634); +} // namespace nObjMHasu + #endif /* D_A_OBJ_HASU2_H */ diff --git a/include/rel/d/a/obj/d_a_obj_hb/d_a_obj_hb.h b/include/rel/d/a/obj/d_a_obj_hb/d_a_obj_hb.h index 16d98c8496d..f7f5c8d7ad2 100644 --- a/include/rel/d/a/obj/d_a_obj_hb/d_a_obj_hb.h +++ b/include/rel/d/a/obj/d_a_obj_hb/d_a_obj_hb.h @@ -1,5 +1,21 @@ #ifndef D_A_OBJ_HB_H #define D_A_OBJ_HB_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class obj_hb_class + * @brief Huge Baba Seed + * + * @details + * + */ +class obj_hb_class : public fopAc_ac_c { +private: + /* 0x568 */ u8 field_0x568[0xa8c - 0x568]; +}; +STATIC_ASSERT(sizeof(obj_hb_class) == 0xa8c); + #endif /* D_A_OBJ_HB_H */ diff --git a/include/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya.h b/include/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya.h index fc66e643e90..db5cc62ba56 100644 --- a/include/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya.h +++ b/include/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya.h @@ -6,6 +6,14 @@ #include "d/event/d_event_lib.h" #include "f_op/f_op_actor_mng.h" +/** + * @ingroup actors-objects + * @class daObjHBombkoya_c + * @brief Destructable Bomb House + * + * @details + * + */ class daObjHBombkoya_c : public dBgS_MoveBgActor, public request_of_phase_process_class, public dEvLib_callback_c { @@ -31,6 +39,7 @@ class daObjHBombkoya_c : public dBgS_MoveBgActor, int getSwNo() { return fopAcM_GetParamBit(this, 0, 8); } int getSw2No() { return fopAcM_GetParamBit(this, 8, 8); } +private: /* 0x5A8 */ // dEvLib_callback_c /* 0x5B8 */ Mtx mBgMtx; /* 0x5E8 */ Mtx mMtx; @@ -41,5 +50,7 @@ class daObjHBombkoya_c : public dBgS_MoveBgActor, /* 0x648 */ dCcD_Stts mStts; /* 0x684 */ dCcD_Cyl mCyl; }; +STATIC_ASSERT(sizeof(daObjHBombkoya_c) == 0x7c0); + #endif /* D_A_OBJ_HBOMBKOYA_H */ diff --git a/include/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw.h b/include/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw.h index 6dec3060c9a..1537c123fea 100644 --- a/include/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw.h +++ b/include/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw.h @@ -6,6 +6,14 @@ #include "d/com/d_com_inf_game.h" #include "m_Do/m_Do_hostIO.h" +/** + * @ingroup actors-objects + * @class daHeavySw_c + * @brief Heavy Switch + * + * @details + * + */ class daHeavySw_c : public dBgS_MoveBgActor { public: enum Mode_e { MODE_WAIT, MODE_RIDE, MODE_MOVE_INIT, MODE_MOVE, MODE_MOVE_END }; diff --git a/include/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.h b/include/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.h index 7f0968f2243..bf01f348cb1 100644 --- a/include/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.h +++ b/include/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.h @@ -1,6 +1,35 @@ #ifndef D_A_OBJ_HFUTA_H #define D_A_OBJ_HFUTA_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjFuta_c + * @brief Crawling? + * + * @details + * + */ +class daObjFuta_c : public fopAc_ac_c { +public: + /* 80C1DD8C */ void initBaseMtx(); + /* 80C1DDC8 */ void setBaseMtx(); + /* 80C1DE94 */ void Create(); + /* 80C1DF2C */ void CreateHeap(); + /* 80C1DF9C */ void create1st(); + /* 80C1E020 */ void Execute(f32 (**)[3][4]); + /* 80C1EB38 */ void mode_proc_call(); + /* 80C1EBDC */ void mode_wait(); + /* 80C1EC44 */ void mode_move(); + /* 80C1ECB4 */ void mode_end(); + /* 80C1ECC4 */ void Draw(); + /* 80C1ED68 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x5cc - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjFuta_c) == 0x5cc); + #endif /* D_A_OBJ_HFUTA_H */ diff --git a/include/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.h b/include/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.h index 501906d0cdd..3514b3dd185 100644 --- a/include/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.h +++ b/include/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.h @@ -1,5 +1,41 @@ #ifndef D_A_OBJ_HHASHI_H #define D_A_OBJ_HHASHI_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjHHASHI_c + * @brief Pillar + * + * @details + * + */ +class daObjHHASHI_c : public fopAc_ac_c { +public: + /* 8057F9B8 */ void initCcCylinder(); + /* 8057FA18 */ void setCcCylinder(); + /* 8057FA90 */ void Set_Hahen(cXyz*); + /* 8057FDA8 */ void Set_Speed(s16, s16, f32, f32, f32, f32); + /* 805801B0 */ void Obj_Damage(); + /* 80580358 */ void Wall_Check(s16); + /* 8058043C */ void Hahen_Motion(s16); + /* 805805F4 */ void CheckCull(); + /* 805807C4 */ void checkViewArea(int); + /* 80580854 */ void Rolling(cXyz*, f32, f32, s8); + /* 80580A48 */ void Roll_Set(cXyz*, f32, s16); + /* 80580C80 */ void setBaseMtx(); + /* 80580DA4 */ void CreateHeap(); + /* 80580EA0 */ void create(); + /* 805811CC */ void Create(); + /* 80581210 */ void Execute(f32 (**)[3][4]); + /* 805812BC */ void Draw(); + /* 8058140C */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x119c - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjHHASHI_c) == 0x119c); + #endif /* D_A_OBJ_HHASHI_H */ diff --git a/include/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.h b/include/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.h index 3fcb2002285..f2bd7fea171 100644 --- a/include/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.h +++ b/include/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.h @@ -4,6 +4,14 @@ #include "d/bg/d_bg_s_movebg_actor.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_hostIO.h" +/** + * @ingroup actors-objects + * @class daHsTarget_c + * @brief Clawshot Target + * + * @details + * + */ class daHsTarget_c : public dBgS_MoveBgActor { public: /* 80C1F490 */ void setBaseMtx(); @@ -15,10 +23,12 @@ class daHsTarget_c : public dBgS_MoveBgActor { u8 getModelType() { return fopAcM_GetParamBit(this, 0, 4); } +private: /* 0x5A0 */ request_of_phase_process_class mPhaseReq; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ u8 mIndex; -}; // Size: 0x5B0 +}; +STATIC_ASSERT(sizeof(daHsTarget_c) == 0x5B0); class daHsTarget_HIO_c : mDoHIO_entry_c { public: diff --git a/include/rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.h b/include/rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.h index ece0ef97be9..10af13992ac 100644 --- a/include/rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.h +++ b/include/rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.h @@ -5,6 +5,14 @@ #include "d/bg/d_bg_s_movebg_actor.h" #include "d/cc/d_cc_d.h" +/** + * @ingroup actors-objects + * @class daObjIce_l_c + * @brief Ice (Large) + * + * @details + * + */ class daObjIce_l_c : public dBgS_MoveBgActor { public: /* 80C1F9F8 */ void RideOn_Angle(s16&, f32, s16, f32); @@ -19,6 +27,7 @@ class daObjIce_l_c : public dBgS_MoveBgActor { /* 80C206AC */ virtual int Draw(); /* 80C20750 */ virtual int Delete(); +private: /* 0x5A0 */ f32 field_0x5a0; /* 0x5A4 */ f32 field_0x5a4; /* 0x5A8 */ u8 field_0x5A8[0x5AC - 0x5A8]; @@ -47,5 +56,6 @@ class daObjIce_l_c : public dBgS_MoveBgActor { /* 0x634 */ J3DModel* mpModel; /* 0x638 */ request_of_phase_process_class mPhase; }; +STATIC_ASSERT(sizeof(daObjIce_l_c) == 0x640); #endif /* D_A_OBJ_ICE_L_H */ diff --git a/include/rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.h b/include/rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.h index f079fdc8013..e43ea568c73 100644 --- a/include/rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.h +++ b/include/rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.h @@ -1,6 +1,40 @@ #ifndef D_A_OBJ_ICE_S_H #define D_A_OBJ_ICE_S_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjIce_s_c + * @brief Ice (Small) + * + * @details + * + */ +class daObjIce_s_c : public fopAc_ac_c { +public: + /* 80C209DC */ void RideOn_Angle(s16&, f32, s16, f32); + /* 80C20A44 */ void Check_LinkRideOn(cXyz); + /* 80C20C98 */ void Check_RideOn(cXyz); + /* 80C20EC0 */ void initBaseMtx(); + /* 80C20EEC */ void setBaseMtx(); + /* 80C212CC */ void create(); + /* 80C2157C */ void CreateHeap(); + /* 80C215F4 */ void Create(); + /* 80C21634 */ void Execute(f32 (**)[3][4]); + /* 80C21964 */ void Draw(); + /* 80C21A08 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x644 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjIce_s_c) == 0x644); + +class daOBJ_ICE_S_HIO_c { +public: + /* 80C209AC */ daOBJ_ICE_S_HIO_c(); + /* 80C21A60 */ ~daOBJ_ICE_S_HIO_c(); +}; + #endif /* D_A_OBJ_ICE_S_H */ diff --git a/include/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.h b/include/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.h index 8cc1ecead72..0d7d2eb3e26 100644 --- a/include/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.h +++ b/include/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.h @@ -1,5 +1,54 @@ #ifndef D_A_OBJ_ICEBLOCK_H #define D_A_OBJ_ICEBLOCK_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjIceBlk_c + * @brief Sliding Ice Block + * + * @details + * + */ +class daObjIceBlk_c : public fopAc_ac_c { +public: + /* 80C21CD8 */ void PPCallBack(fopAc_ac_c*, fopAc_ac_c*, s16, dBgW_Base::PushPullLabel); + /* 80C21DC4 */ void initBaseMtx(); + /* 80C21E24 */ void setBaseMtx(); + /* 80C21EA4 */ void getPointNo(); + /* 80C21F2C */ void loadCurrentPos(); + /* 80C21FC8 */ void saveCurrentPos(); + /* 80C22200 */ void enablePushPull(); + /* 80C2224C */ void disablePushPull(); + /* 80C22298 */ void Create(); + /* 80C22618 */ void CreateHeap(); + /* 80C227F4 */ void create1st(); + /* 80C228B4 */ void Execute(f32 (**)[3][4]); + /* 80C2294C */ void checkWalk(); + /* 80C22B04 */ void clrCounter(); + /* 80C22B28 */ void mode_proc_call(); + /* 80C22EF8 */ void mode_init_wait(); + /* 80C22F74 */ void mode_proc_wait(); + /* 80C23058 */ void mode_init_walk(); + /* 80C23088 */ void mode_proc_walk(); + /* 80C23388 */ void setEffect(); + /* 80C2350C */ void checkWallPre(s16); + /* 80C236C8 */ void checkBgHit(); + /* 80C237B0 */ void bgCheck(); + /* 80C23860 */ void init_bgCheck(); + /* 80C238B0 */ void checkFall(); + /* 80C23A50 */ void event_proc_call(); + /* 80C23B0C */ void actionWait(); + /* 80C23B70 */ void actionOrderEvent(); + /* 80C23C1C */ void actionEvent(); + /* 80C23CA0 */ void actionDead(); + /* 80C23CA4 */ void Draw(); + /* 80C23DA8 */ void Delete(); +private: + /* 0x568 */ u8 field_0x568[0x9ec - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjIceBlk_c) == 0x9ec); + #endif /* D_A_OBJ_ICEBLOCK_H */ diff --git a/include/rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.h b/include/rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.h index 1243fe935dc..0ce3b109edf 100644 --- a/include/rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.h +++ b/include/rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.h @@ -1,8 +1,18 @@ #ifndef D_A_OBJ_ICELEAF_H #define D_A_OBJ_ICELEAF_H +#include "f_op/f_op_actor_mng.h" #include "d/cc/d_cc_d.h" +#include "d/bg/d_bg_s_acch.h" +/** + * @ingroup actors-objects + * @class daObjIceLeaf_c + * @brief Ice Leaf + * + * @details + * + */ class daObjIceLeaf_c : public fopAc_ac_c { public: /* 80C24738 */ void initBaseMtx(); @@ -29,6 +39,7 @@ class daObjIceLeaf_c : public fopAc_ac_c { void offRide() { mRide = false; } void setBreakEffect() { mBreakEffect = true; } +private: /* 0x568 */ request_of_phase_process_class mPhase; /* 0x570 */ J3DModel* mpModel; /* 0x574 */ dBgS_ObjAcch mAcch; @@ -49,5 +60,7 @@ class daObjIceLeaf_c : public fopAc_ac_c { /* 0x964 */ cXyz field_0x964; /* 0x970 */ cXyz field_0x970; }; +STATIC_ASSERT(sizeof(daObjIceLeaf_c) == 0x97c); + #endif /* D_A_OBJ_ICELEAF_H */ diff --git a/include/rel/d/a/obj/d_a_obj_ihasi/d_a_obj_ihasi.h b/include/rel/d/a/obj/d_a_obj_ihasi/d_a_obj_ihasi.h index df2606add70..81abb1d38ba 100644 --- a/include/rel/d/a/obj/d_a_obj_ihasi/d_a_obj_ihasi.h +++ b/include/rel/d/a/obj/d_a_obj_ihasi/d_a_obj_ihasi.h @@ -1,6 +1,21 @@ #ifndef D_A_OBJ_IHASI_H #define D_A_OBJ_IHASI_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class obj_ihasi_class + * @brief Ice Bridge? + * + * @details + * + */ +class obj_ihasi_class : public fopAc_ac_c { +private: + /* 0x568 */ u8 field_0x568[0x5c4 - 0x568]; +}; +STATIC_ASSERT(sizeof(obj_ihasi_class) == 0x5c4); + #endif /* D_A_OBJ_IHASI_H */ diff --git a/include/rel/d/a/obj/d_a_obj_ikada/d_a_obj_ikada.h b/include/rel/d/a/obj/d_a_obj_ikada/d_a_obj_ikada.h index 0bff8042a3e..5b2167831bb 100644 --- a/include/rel/d/a/obj/d_a_obj_ikada/d_a_obj_ikada.h +++ b/include/rel/d/a/obj/d_a_obj_ikada/d_a_obj_ikada.h @@ -1,6 +1,32 @@ #ifndef D_A_OBJ_IKADA_H #define D_A_OBJ_IKADA_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjIkada_c + * @brief Raft + * + * @details + * + */ +class daObjIkada_c : public fopAc_ac_c { +public: + /* 80C269B8 */ void RideOn_Angle(s16&, f32, s16, f32); + /* 80C26A20 */ void Check_RideOn(); + /* 80C26C50 */ void initBaseMtx(); + /* 80C26C7C */ void setBaseMtx(); + /* 80C27028 */ void CreateHeap(); + /* 80C270A0 */ void Create(); + /* 80C270E0 */ void Execute(f32 (**)[3][4]); + /* 80C27400 */ void Draw(); + /* 80C274A4 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x844 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjIkada_c) == 0x844); + #endif /* D_A_OBJ_IKADA_H */ diff --git a/include/rel/d/a/obj/d_a_obj_inobone/d_a_obj_inobone.h b/include/rel/d/a/obj/d_a_obj_inobone/d_a_obj_inobone.h index 8ca4e5e4a1a..a0ea465f2ad 100644 --- a/include/rel/d/a/obj/d_a_obj_inobone/d_a_obj_inobone.h +++ b/include/rel/d/a/obj/d_a_obj_inobone/d_a_obj_inobone.h @@ -1,5 +1,32 @@ #ifndef D_A_OBJ_INOBONE_H #define D_A_OBJ_INOBONE_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjIBone_c + * @brief Boar Bone + * + * @details + * + */ +class daObjIBone_c : public fopAc_ac_c { +public: + /* 80C27830 */ void initBaseMtx(); + /* 80C2786C */ void setBaseMtx(); + /* 80C278CC */ void Create(); + /* 80C279A8 */ void CreateHeap(); + /* 80C27A20 */ void create(); + /* 80C27C4C */ void execute(); + /* 80C27E48 */ void setBreakEffect(); + /* 80C27FEC */ void draw(); + /* 80C28050 */ void _delete(); + +private: + /* 0x568 */ u8 field_0x568[0x84c - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjIBone_c) == 0x84c); + #endif /* D_A_OBJ_INOBONE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_ita/d_a_obj_ita.h b/include/rel/d/a/obj/d_a_obj_ita/d_a_obj_ita.h index 01eaf68254c..91bb276dc01 100644 --- a/include/rel/d/a/obj/d_a_obj_ita/d_a_obj_ita.h +++ b/include/rel/d/a/obj/d_a_obj_ita/d_a_obj_ita.h @@ -1,6 +1,38 @@ #ifndef D_A_OBJ_ITA_H #define D_A_OBJ_ITA_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjIta_c + * @brief Plank + * + * @details + * + */ +class daObjIta_c : public fopAc_ac_c { +public: + /* 80C283AC */ void Search_Ymb(); + /* 80C28674 */ void Check_RideOn(); + /* 80C28788 */ void initBaseMtx(); + /* 80C287B4 */ void setBaseMtx(); + /* 80C28928 */ void create(); + /* 80C28BB0 */ void CreateHeap(); + /* 80C28C28 */ void Create(); + /* 80C28C70 */ void Execute(f32 (**)[3][4]); + /* 80C290AC */ void Draw(); + /* 80C29150 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x8dc - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjIta_c) == 0x8dc); + +class daObj_ITA_HIO_c { +public: + /* 80C2836C */ daObj_ITA_HIO_c(); + /* 80C29184 */ ~daObj_ITA_HIO_c(); +}; #endif /* D_A_OBJ_ITA_H */ diff --git a/include/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato.h b/include/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato.h index abb1f2d6f2d..5e60f258a45 100644 --- a/include/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato.h +++ b/include/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato.h @@ -1,5 +1,45 @@ #ifndef D_A_OBJ_ITAMATO_H #define D_A_OBJ_ITAMATO_H +#include "f_op/f_op_actor_mng.h" +#include "d/cc/d_cc_d.h" + +/** + * @ingroup actors-objects + * @class daObj_ItaMato_c + * @brief Plank Target + * + * @details + * + */ +class daObj_ItaMato_c : public fopAc_ac_c { +public: + /* 80C294EC */ ~daObj_ItaMato_c(); + /* 80C2971C */ void create(); + /* 80C29CD8 */ void CreateHeap(); + /* 80C29DAC */ void Delete(); + /* 80C29DE0 */ void Execute(); + /* 80C2A44C */ void Draw(); + /* 80C2A5D0 */ void createHeapCallBack(fopAc_ac_c*); + /* 80C2A5F0 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); + /* 80C2A620 */ void getResName(); + /* 80C2A630 */ void setSwayParam(fopAc_ac_c*); + /* 80C2A7C4 */ void setPrtcls(); + /* 80C2A890 */ void setEnvTevColor(); + /* 80C2A8EC */ void setRoomNo(); + /* 80C2A930 */ void setMtx(); + +private: + /* 0x568 */ u8 field_0x568[0xa20 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObj_ItaMato_c) == 0xa20); + +class daObj_ItaMato_Param_c { +public: + /* 80C2AB04 */ ~daObj_ItaMato_Param_c(); + + static u8 const m[20]; +}; + #endif /* D_A_OBJ_ITAMATO_H */ diff --git a/include/rel/d/a/obj/d_a_obj_ito/d_a_obj_ito.h b/include/rel/d/a/obj/d_a_obj_ito/d_a_obj_ito.h index d881ad8801b..04a37739fdc 100644 --- a/include/rel/d/a/obj/d_a_obj_ito/d_a_obj_ito.h +++ b/include/rel/d/a/obj/d_a_obj_ito/d_a_obj_ito.h @@ -1,5 +1,29 @@ #ifndef D_A_OBJ_ITO_H #define D_A_OBJ_ITO_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class obj_ito_class + * @brief ??? + * + * @details + * + */ +class obj_ito_class : public fopAc_ac_c { +private: + /* 0x568 */ u8 field_0x568[0x150c - 0x568]; +}; +STATIC_ASSERT(sizeof(obj_ito_class) == 0x150c); + +struct ito_s {}; + +class daObj_Ito_HIO_c { +public: + /* 8047B2EC */ daObj_Ito_HIO_c(); + /* 8047D778 */ ~daObj_Ito_HIO_c(); +}; + #endif /* D_A_OBJ_ITO_H */ diff --git a/include/rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.h b/include/rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.h index cdea06675a5..dcbecb43910 100644 --- a/include/rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.h +++ b/include/rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.h @@ -8,7 +8,16 @@ #include "d/a/d_a_player.h" #include "d/d_insect.h" -struct daObjKABUTO_c : public dInsect_c { +/** + * @ingroup actors-objects + * @class daObjKABUTO_c + * @brief Insect - Beetle + * + * @details + * + */ +class daObjKABUTO_c : public dInsect_c { +public: enum Action { /* 0 */ ACT_WAIT, /* 1 */ ACT_MOVE, @@ -38,6 +47,7 @@ struct daObjKABUTO_c : public dInsect_c { /* 80C2D724 */ cPhs__Step create(); inline int Draw(); +private: /* 0x590 */ dCcD_Stts mCcStts; /* 0x5CC */ dCcD_Sph mCcSph; /* 0x704 */ daPy_boomerangMove_c mBoomerangMove; @@ -74,7 +84,8 @@ struct daObjKABUTO_c : public dInsect_c { STATIC_ASSERT(sizeof(daObjKABUTO_c) == 0xA14); -struct daObj_KabHIO_c { +class daObj_KabHIO_c { +public: /* 80C2AE6C */ daObj_KabHIO_c(); /* 80C2E068 */ virtual ~daObj_KabHIO_c() {} diff --git a/include/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.h b/include/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.h index 342814f948a..a0427d5a8ff 100644 --- a/include/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.h +++ b/include/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.h @@ -1,6 +1,45 @@ #ifndef D_A_OBJ_KAG_H #define D_A_OBJ_KAG_H -#include "dolphin/types.h" +#include "d/d_insect.h" + +/** + * @ingroup actors-objects + * @class daObjKAG_c + * @brief Insect - Dayfly + * + * @details + * + */ +class daObjKAG_c : public dInsect_c { +public: + /* 80C2E434 */ void setAction(void (daObjKAG_c::*)()); + /* 80C2E7A0 */ void Kag_Bgcheck(cXyz*, csXyz*, cXyz*); + /* 80C2EA40 */ void fly(); + /* 80C2F764 */ void wait(); + /* 80C2F8C4 */ void walk(); + /* 80C2FD94 */ void bin_wait(); + /* 80C2FF10 */ void bin_action(); + /* 80C30070 */ void hook(); + /* 80C30274 */ void boomerang(); + /* 80C303C4 */ void action(); + /* 80C30424 */ void checkGroundPos(); + /* 80C30498 */ void hit_check(); + /* 80C3054C */ void execute(); + /* 80C306EC */ void _delete(); + /* 80C30754 */ void setBaseMtx(); + /* 80C308F0 */ void create(); + /* 80C30E54 */ void kag_setParticle(); + +private: + /* 0x590 */ u8 field_0x568[0x860 - 0x590]; +}; +STATIC_ASSERT(sizeof(daObjKAG_c) == 0x860); + +class daObj_KagHIO_c { +public: + /* 80C2E40C */ daObj_KagHIO_c(); + /* 80C31060 */ ~daObj_KagHIO_c(); +}; #endif /* D_A_OBJ_KAG_H */ diff --git a/include/rel/d/a/obj/d_a_obj_kage/d_a_obj_kage.h b/include/rel/d/a/obj/d_a_obj_kage/d_a_obj_kage.h index 4fc63d8716a..2cf46c68e2a 100644 --- a/include/rel/d/a/obj/d_a_obj_kage/d_a_obj_kage.h +++ b/include/rel/d/a/obj/d_a_obj_kage/d_a_obj_kage.h @@ -1,6 +1,21 @@ #ifndef D_A_OBJ_KAGE_H #define D_A_OBJ_KAGE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class obj_kage_class + * @brief House - Cage + * + * @details + * + */ +class obj_kage_class : public fopAc_ac_c { +private: + /* 0x568 */ u8 field_0x568[0x5b4 - 0x568]; +}; +STATIC_ASSERT(sizeof(obj_kage_class) == 0x5b4); + #endif /* D_A_OBJ_KAGE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_kago/d_a_obj_kago.h b/include/rel/d/a/obj/d_a_obj_kago/d_a_obj_kago.h index 3cb12e6403d..06484078f73 100644 --- a/include/rel/d/a/obj/d_a_obj_kago/d_a_obj_kago.h +++ b/include/rel/d/a/obj/d_a_obj_kago/d_a_obj_kago.h @@ -1,5 +1,46 @@ #ifndef D_A_OBJ_KAGO_H #define D_A_OBJ_KAGO_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObj_Kago_c + * @brief Basket + * + * @details + * + */ +class daObj_Kago_c : public fopAc_ac_c { +public: + /* 80C31AEC */ ~daObj_Kago_c(); + /* 80C31D5C */ void create(); + /* 80C323D0 */ void CreateHeap(); + /* 80C324B0 */ void Delete(); + /* 80C324E4 */ void Execute(); + /* 80C332D0 */ void Draw(); + /* 80C333F0 */ void createHeapCallBack(fopAc_ac_c*); + /* 80C33410 */ void isDelete(); + /* 80C334B4 */ void setEnvTevColor(); + /* 80C33510 */ void setRoomNo(); + /* 80C33554 */ void reset(); + /* 80C3359C */ void setMtx(); + /* 80C33620 */ void getWallAngle(s16, s16*); + /* 80C337B0 */ void setGoalPosAndAngle(); + /* 80C338D0 */ void setSmokePrtcl(); + /* 80C33958 */ void setWaterPrtcl(); + /* 80C33A58 */ void setHamonPrtcl(); +private: + /* 0x568 */ u8 field_0x568[0xba8 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObj_Kago_c) == 0xba8); + +class daObj_Kago_Param_c { +public: + /* 80C33C14 */ ~daObj_Kago_Param_c(); + + static u8 const m[44]; +}; + #endif /* D_A_OBJ_KAGO_H */ diff --git a/include/rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.h b/include/rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.h index aa69b1385f0..459a240d086 100644 --- a/include/rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.h +++ b/include/rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.h @@ -1,5 +1,31 @@ #ifndef D_A_OBJ_KAISOU_H #define D_A_OBJ_KAISOU_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjKaisou_c + * @brief Seaweed + * + * @details + * + */ +class daObjKaisou_c : public fopAc_ac_c { +public: + /* 80C34058 */ void ctrlJoint(J3DJoint*, J3DModel*); + /* 80C34390 */ void initCcCylinder(); + /* 80C343F0 */ void setCcCylinder(); + /* 80C34438 */ void ObjHit(); + /* 80C34824 */ void Execute(); + /* 80C34A98 */ void Delete(); + /* 80C34ACC */ void setBaseMtx(); + /* 80C34BD8 */ void create(); + +private: + /* 0x568 */ u8 field_0x568[0x79c - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjKaisou_c) == 0x79c); + #endif /* D_A_OBJ_KAISOU_H */ diff --git a/include/rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri.h b/include/rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri.h index 707efda5dd5..1ba5f2f21bb 100644 --- a/include/rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri.h +++ b/include/rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri.h @@ -1,5 +1,51 @@ #ifndef D_A_OBJ_KAMAKIRI_H #define D_A_OBJ_KAMAKIRI_H +#include "d/d_insect.h" + +/** + * @ingroup actors-objects + * @class daObjKAM_c + * @brief Insect - Mantis + * + * @details + * + */ +class daObjKAM_c : public fopAc_ac_c { +public: + /* 80C351BC */ void InitCcSph(); + /* 80C35228 */ void SetCcSph(); + /* 80C352A0 */ void CreateHeap(); + /* 80C35684 */ void ShopWaitAction(); + /* 80C357EC */ void WaitAction(); + /* 80C35970 */ void WallCheck(); + /* 80C35BE4 */ void SpeedSet(); + /* 80C35CF0 */ void WallWalk(); + /* 80C36138 */ void WalkAction(); + /* 80C36338 */ void MoveAction(); + /* 80C36B20 */ void Action(); + /* 80C36BE4 */ void ShopAction(); + /* 80C36CA0 */ void Insect_Release(); + /* 80C36CB8 */ void Z_BufferChk(); + /* 80C36E34 */ void ParticleSet(); + /* 80C36F58 */ void BoomChk(); + /* 80C37324 */ void ObjHit(); + /* 80C374AC */ void Execute(); + /* 80C37724 */ void Delete(); + /* 80C3778C */ void setBaseMtx(); + /* 80C378F4 */ void CreateChk(); + /* 80C37AA0 */ void create(); + +private: + /* 0x568 */ u8 field_0x568[0xa68 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjKAM_c) == 0xa68); + +class daObj_KamHIO_c { +public: + /* 80C3518C */ daObj_KamHIO_c(); + /* 80C38360 */ ~daObj_KamHIO_c(); +}; + #endif /* D_A_OBJ_KAMAKIRI_H */ diff --git a/include/rel/d/a/obj/d_a_obj_kanban2/d_a_obj_kanban2.h b/include/rel/d/a/obj/d_a_obj_kanban2/d_a_obj_kanban2.h index bde75bba84e..a770de044cc 100644 --- a/include/rel/d/a/obj/d_a_obj_kanban2/d_a_obj_kanban2.h +++ b/include/rel/d/a/obj/d_a_obj_kanban2/d_a_obj_kanban2.h @@ -1,6 +1,61 @@ #ifndef D_A_OBJ_KANBAN2_H #define D_A_OBJ_KANBAN2_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObj_Kanban2_c + * @brief Sign 2 + * + * @details + * + */ +class daObj_Kanban2_c : public fopAc_ac_c { +public: + /* 80581790 */ void draw(); + /* 80581938 */ void setKanbanSE(int); + /* 805819BC */ void createBreakParts(u32, csXyz); + /* 805819FC */ void createWallHitBreak(); + /* 80581B5C */ void getKanbanCutType(); + /* 80581C48 */ void getKanbanWolfCutType(); + /* 80581D04 */ void damage_check(); + /* 8058221C */ void float_damage_check(); + /* 805822F0 */ void deletePart(); + /* 805825A4 */ void getWallAngle(); + /* 8058271C */ void setGroundAngle(); + /* 80582894 */ void checkWaterSurface(); + /* 80582944 */ void checkPataGround(s16, s16); + /* 80582A68 */ void setCullMtx(); + /* 80582AAC */ void setSmokeEffect(cXyz); + /* 80582AFC */ void setWaterEffect(); + /* 80582C40 */ void setCenterPos(); + /* 80582E68 */ void checkCarryOn(); + /* 80582EF0 */ void setActionMode(int, int); + /* 80582F40 */ void calcNormalSwing(); + /* 80583364 */ void executeNormal(); + /* 80583598 */ void initPart(); + /* 80583A2C */ void executePart(); + /* 8058437C */ void executeFloat(); + /* 80584884 */ void executeCarry(); + /* 805849CC */ void action(); + /* 80584AD8 */ void mtx_set(); + /* 80584CFC */ void cc_set(); + /* 80584DF0 */ void execute(); + /* 80584ED8 */ void _delete(); + /* 80584F64 */ void CreateHeap(); + /* 805850E8 */ void create(); + +private: + /* 0x568 */ u8 field_0x568[0xa50 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObj_Kanban2_c) == 0xa50); + +class daObj_Kanban2_HIO_c { +public: + /* 8058176C */ daObj_Kanban2_HIO_c(); + /* 80585578 */ ~daObj_Kanban2_HIO_c(); +}; + #endif /* D_A_OBJ_KANBAN2_H */ diff --git a/include/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.h b/include/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.h index 881e1c7eab0..3d9f222d699 100644 --- a/include/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.h +++ b/include/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.h @@ -1,4 +1,70 @@ #ifndef D_A_OBJ_KANTERA_H #define D_A_OBJ_KANTERA_H +#include "d/a/d_a_itembase.h" + +#ifdef NONMATCHING +/** + * @ingroup actors-objects + * @class daItemKantera_c + * @brief Lantern + * + * @details + * + */ +class daItemKantera_c : public daItemBase_c { +public: + /* 80C389BC */ void initBaseMtx(); + /* 80C389F8 */ void setBaseMtx(); + /* 80C38A64 */ int Create(); + /* 80C38BA8 */ int __CreateHeap(); + /* 80C38BB0 */ int create(); + /* 80C38F78 */ void bg_check(); + /* 80C39068 */ int actionInit(); + /* 80C390A0 */ int actionWaitInit(); + /* 80C3911C */ int actionWait(); + /* 80C39234 */ int initActionOrderGetDemo(); + /* 80C392D0 */ int actionOrderGetDemo(); + /* 80C3934C */ int actionGetDemo(); + /* 80C393B0 */ int execute(); + /* 80C394DC */ int draw(); + /* 80C39530 */ int _delete(); + + void setStatus(u8 i_status) { mStatus = i_status; } + +private: + /* 0x92C */ u32 field_0x92c; + /* 0x930 */ s32 field_0x930; + /* 0x934 */ u8 mStatus; + /* 0x935 */ u8 field_0x935; + /* 0x936 */ u8 field_0x936; + /* 0x937 */ u8 field_0x937; + /* 0x938 */ s16 field_0x938; + /* 0x93A */ s16 field_0x93a; + /* 0x93C */ cXyz field_0x93c; +}; +STATIC_ASSERT(sizeof(daItemKantera_c) == 0x948); +#else +struct daItemKantera_c { + /* 80C389BC */ void initBaseMtx(); + /* 80C389F8 */ void setBaseMtx(); + /* 80C38A64 */ int Create(); + /* 80C38BA8 */ int __CreateHeap(); + /* 80C38BB0 */ int create(); + /* 80C38F78 */ void bg_check(); + /* 80C39068 */ int actionInit(); + /* 80C390A0 */ int actionWaitInit(); + /* 80C3911C */ int actionWait(); + /* 80C39234 */ int initActionOrderGetDemo(); + /* 80C392D0 */ int actionOrderGetDemo(); + /* 80C3934C */ int actionGetDemo(); + /* 80C393B0 */ int execute(); + /* 80C394DC */ int draw(); + /* 80C39530 */ int _delete(); + +private: + /* 0x000 */ u8 field_0x0[0x948]; +}; +#endif + #endif /* D_A_OBJ_KANTERA_H */ diff --git a/include/rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri.h b/include/rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri.h index d681497302f..beafc48c797 100644 --- a/include/rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri.h +++ b/include/rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri.h @@ -1,5 +1,48 @@ #ifndef D_A_OBJ_KATATSUMURI_H #define D_A_OBJ_KATATSUMURI_H +#include "d/d_insect.h" + +/** + * @ingroup actors-objects + * @class daObjKAT_c + * @brief Insect - Snail + * + * @details + * + */ +class daObjKAT_c : public fopAc_ac_c { +public: + /* 80C39994 */ void InitCcSph(); + /* 80C39A00 */ void SetCcSph(); + /* 80C39A58 */ void ctrlJoint(J3DJoint*, J3DModel*); + /* 80C39B98 */ void CreateHeap(); + /* 80C39F0C */ void WallWalk(); + /* 80C3A4D8 */ void MoveAction(); + /* 80C3A628 */ void Action(); + /* 80C3A680 */ void Insect_Release(); + /* 80C3A698 */ void checkGround(); + /* 80C3A8C8 */ void F_MoveAction(); + /* 80C3A95C */ void FallAction(); + /* 80C3A990 */ void ParticleSet(); + /* 80C3AAB4 */ void BoomChk(); + /* 80C3ADC8 */ void ObjHit(); + /* 80C3AEC8 */ void Execute(); + /* 80C3B754 */ void Z_BufferChk(); + /* 80C3B8D0 */ void Delete(); + /* 80C3B938 */ void setBaseMtx(); + /* 80C3BAAC */ void CreateChk(); + /* 80C3BC58 */ void create(); + +private: + /* 0x568 */ u8 field_0x568[0xa74 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjKAT_c) == 0xa74); + +class daObj_KatHIO_c { +public: + /* 80C3996C */ daObj_KatHIO_c(); + /* 80C3C5CC */ ~daObj_KatHIO_c(); +}; #endif /* D_A_OBJ_KATATSUMURI_H */ diff --git a/include/rel/d/a/obj/d_a_obj_kazeneko/d_a_obj_kazeneko.h b/include/rel/d/a/obj/d_a_obj_kazeneko/d_a_obj_kazeneko.h index f568a32073c..da43da3c3bb 100644 --- a/include/rel/d/a/obj/d_a_obj_kazeneko/d_a_obj_kazeneko.h +++ b/include/rel/d/a/obj/d_a_obj_kazeneko/d_a_obj_kazeneko.h @@ -1,5 +1,31 @@ #ifndef D_A_OBJ_KAZENEKO_H #define D_A_OBJ_KAZENEKO_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjKazeNeko_c + * @brief Weather Vane + * + * @details + * + */ +class daObjKazeNeko_c : public fopAc_ac_c { +public: + /* 80C3C8D8 */ void create_init(); + /* 80C3C968 */ void initBaseMtx(); + /* 80C3C988 */ void setBaseMtx(); + /* 80C3CA8C */ void initCcCylinder(); + /* 80C3CB10 */ void setCcCylinder(); + /* 80C3CB7C */ void swingHead(); + /* 80C3CC40 */ void getFirstVec(cXyz*, int); + + static u8 const M_attr[44]; +private: + /* 0x568 */ u8 field_0x568[0x754 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjKazeNeko_c) == 0x754); + #endif /* D_A_OBJ_KAZENEKO_H */ diff --git a/include/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket.h b/include/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket.h index 50382ef4a9c..5a534eb087b 100644 --- a/include/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket.h +++ b/include/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket.h @@ -1,5 +1,46 @@ #ifndef D_A_OBJ_KBACKET_H #define D_A_OBJ_KBACKET_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObj_KBacket_c + * @brief (Kakariko?) Bucket + * + * @details + * + */ +class daObj_KBacket_c : public fopAc_ac_c { +public: + /* 80585E4C */ ~daObj_KBacket_c(); + /* 80586048 */ void create(); + /* 80586604 */ void CreateHeap(); + /* 80586704 */ void Delete(); + /* 80586738 */ void Execute(); + /* 8058742C */ void Draw(); + /* 805875A0 */ void createHeapCallBack(fopAc_ac_c*); + /* 805875C0 */ void setEnvTevColor(); + /* 8058761C */ void setRoomNo(); + /* 80587660 */ void reset(); + /* 80587694 */ void setMtx(); + /* 805877C4 */ void calcRollAngle(s16, int); + /* 80587864 */ void getWallAngle(s16, s16*); + /* 805879F4 */ void setSmokePrtcl(); + /* 80587A70 */ void setWaterPrtcl(); + /* 80587B68 */ void setHamonPrtcl(); + +private: + /* 0x568 */ u8 field_0x568[0xa54 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObj_KBacket_c) == 0xa54); + +class daObj_KBacket_Param_c { +public: + /* 80587D18 */ ~daObj_KBacket_Param_c(); + + static u8 const m[44]; +}; + #endif /* D_A_OBJ_KBACKET_H */ diff --git a/include/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.h b/include/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.h index a161f60e126..31b7974e2f9 100644 --- a/include/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.h +++ b/include/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.h @@ -1,5 +1,27 @@ #ifndef D_A_OBJ_KBOX_H #define D_A_OBJ_KBOX_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class obj_kbox_class + * @brief (Kakariko?) Crate + * + * @details + * + */ +class obj_kbox_class : public fopAc_ac_c { +private: + /* 0x568 */ u8 field_0x568[0x9f0 - 0x568]; +}; +STATIC_ASSERT(sizeof(obj_kbox_class) == 0x9f0); + +class daObj_Kbox_HIO_c { +public: + /* 80C3D60C */ daObj_Kbox_HIO_c(); + /* 80C3EF98 */ ~daObj_Kbox_HIO_c(); +}; + #endif /* D_A_OBJ_KBOX_H */ diff --git a/include/rel/d/a/obj/d_a_obj_key/d_a_obj_key.h b/include/rel/d/a/obj/d_a_obj_key/d_a_obj_key.h index c445dd36fcd..1009be44d05 100644 --- a/include/rel/d/a/obj/d_a_obj_key/d_a_obj_key.h +++ b/include/rel/d/a/obj/d_a_obj_key/d_a_obj_key.h @@ -1,6 +1,27 @@ #ifndef D_A_OBJ_KEY_H #define D_A_OBJ_KEY_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class obj_key_class + * @brief Key + * + * @details + * + */ +class obj_key_class : public fopAc_ac_c { +private: + /* 0x568 */ u8 field_0x568[0x9b8 - 0x568]; +}; +STATIC_ASSERT(sizeof(obj_key_class) == 0x9b8); + +class daObj_Key_HIO_c { +public: + /* 80C3F40C */ daObj_Key_HIO_c(); + /* 80C40F28 */ ~daObj_Key_HIO_c(); +}; + #endif /* D_A_OBJ_KEY_H */ diff --git a/include/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.h b/include/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.h index a5461e5f107..86e796f30ba 100644 --- a/include/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.h +++ b/include/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.h @@ -1,15 +1,39 @@ #ifndef D_A_OBJ_KEYHOLE_H #define D_A_OBJ_KEYHOLE_H -#include "dolphin/types.h" -#include "f_op/f_op_actor.h" +#include "f_op/f_op_actor_mng.h" -struct obj_keyhole_class : public fopAc_ac_c { +/** + * @ingroup actors-objects + * @class obj_keyhole_class + * @brief Small Key Door Chains? + * + * @details + * + */ +class obj_keyhole_class : public fopAc_ac_c { +public: void setOpen() { mOpenState = 1; } bool checkOpenEnd() { return mOpenState == 3; } +private: /* 0x0568 */ u8 field_0x0568[0x2ca4 - 0x568]; /* 0x2ca4 */ u8 mOpenState; + /* 0x2ca5 */ u8 field_0x2ca5[0x2cb8 - 0x2ca5]; }; +STATIC_ASSERT(sizeof(obj_keyhole_class) == 0x2CB8); + +class kh_chain_s { +public: + /* 80C436A0 */ ~kh_chain_s(); + /* 80C437A4 */ kh_chain_s(); +}; + +class daObj_Keyhole_HIO_c { +public: + /* 80C4124C */ daObj_Keyhole_HIO_c(); + /* 80C4394C */ ~daObj_Keyhole_HIO_c(); +}; + #endif /* D_A_OBJ_KEYHOLE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_kgate/d_a_obj_kgate.h b/include/rel/d/a/obj/d_a_obj_kgate/d_a_obj_kgate.h index 02b171e1e74..43a695b2b71 100644 --- a/include/rel/d/a/obj/d_a_obj_kgate/d_a_obj_kgate.h +++ b/include/rel/d/a/obj/d_a_obj_kgate/d_a_obj_kgate.h @@ -5,6 +5,14 @@ #include "d/bg/d_bg_s_movebg_actor.h" #include "d/cc/d_cc_d.h" +/** + * @ingroup actors-objects + * @class daObjKGate_c + * @brief Coro Gate + * + * @details + * + */ class daObjKGate_c : public dBgS_MoveBgActor { public: /* 805880C8 */ void initBaseMtx(); @@ -38,6 +46,7 @@ class daObjKGate_c : public dBgS_MoveBgActor { u8 getEventID() { return fopAcM_GetParamBit(this, 0x14, 8); } u8 getNameArg() { return fopAcM_GetParamBit(this, 0x10, 4); } +private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mpGateModel; /* 0x5AC */ J3DModel* mpGateModel2; diff --git a/include/rel/d/a/obj/d_a_obj_ki/d_a_obj_ki.h b/include/rel/d/a/obj/d_a_obj_ki/d_a_obj_ki.h index bbe9683f597..bccccfa1b3a 100644 --- a/include/rel/d/a/obj/d_a_obj_ki/d_a_obj_ki.h +++ b/include/rel/d/a/obj/d_a_obj_ki/d_a_obj_ki.h @@ -14,6 +14,14 @@ struct sq_cp_s { STATIC_ASSERT(sizeof(sq_cp_s) == 0x30); +/** + * @ingroup actors-objects + * @class obj_ki_class + * @brief Tree + * + * @details + * + */ class obj_ki_class : public fopAc_ac_c { public: /* 0x568 */ request_of_phase_process_class mPhaseReq; diff --git a/include/rel/d/a/obj/d_a_obj_kiPot/d_a_obj_kiPot.h b/include/rel/d/a/obj/d_a_obj_kiPot/d_a_obj_kiPot.h index 59310e87bbd..5967a7b2283 100644 --- a/include/rel/d/a/obj/d_a_obj_kiPot/d_a_obj_kiPot.h +++ b/include/rel/d/a/obj/d_a_obj_kiPot/d_a_obj_kiPot.h @@ -1,6 +1,38 @@ #ifndef D_A_OBJ_KIPOT_H #define D_A_OBJ_KIPOT_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daKiPot_c + * @brief Coro Pot + * + * @details + * + */ +class daKiPot_c : public fopAc_ac_c { +public: + /* 80C44D78 */ void setBaseMtx(); + /* 80C44DD0 */ void create(); + /* 80C44E7C */ void Execute(); + /* 80C44EF8 */ void procMain(); + /* 80C44F74 */ void init_modeWait(); + /* 80C44F80 */ void modeWait(); + /* 80C45008 */ void chkEvent(); + /* 80C45058 */ bool Draw(); + /* 80C45060 */ bool Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x578 - 0x568]; +}; +STATIC_ASSERT(sizeof(daKiPot_c) == 0x578); + +class daKiPot_HIO_c { +public: + /* 80C44D0C */ daKiPot_HIO_c(); + /* 80C450E8 */ ~daKiPot_HIO_c(); +}; + #endif /* D_A_OBJ_KIPOT_H */ diff --git a/include/rel/d/a/obj/d_a_obj_kita/d_a_obj_kita.h b/include/rel/d/a/obj/d_a_obj_kita/d_a_obj_kita.h index 7c1e0bb2f6d..6a70d286632 100644 --- a/include/rel/d/a/obj/d_a_obj_kita/d_a_obj_kita.h +++ b/include/rel/d/a/obj/d_a_obj_kita/d_a_obj_kita.h @@ -1,6 +1,33 @@ #ifndef D_A_OBJ_KITA_H #define D_A_OBJ_KITA_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class obj_kita_class + * @brief Wind Plank + * + * @details + * + */ +class obj_kita_class : public fopAc_ac_c { +private: + /* 0x568 */ u8 field_0x568[0xd78 - 0x568]; +}; +STATIC_ASSERT(sizeof(obj_kita_class) == 0xd78); + +struct kita_s { +public: + /* 80C45E44 */ ~kita_s(); + /* 80C45E80 */ kita_s(); +}; + +class daObj_Kita_HIO_c { +public: + /* 80C4534C */ daObj_Kita_HIO_c(); + /* 80C45E84 */ ~daObj_Kita_HIO_c(); +}; + #endif /* D_A_OBJ_KITA_H */ diff --git a/include/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.h b/include/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.h index 45f9c069948..ab2b6517688 100644 --- a/include/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.h +++ b/include/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.h @@ -4,6 +4,14 @@ #include "d/bg/d_bg_s_movebg_actor.h" #include "d/com/d_com_inf_game.h" +/** + * @ingroup actors-objects + * @class daObjKJgjs_c + * @brief ??? + * + * @details + * + */ class daObjKJgjs_c : public dBgS_MoveBgActor, public request_of_phase_process_class { public: /* 80C46098 */ int create1st(); @@ -17,9 +25,11 @@ class daObjKJgjs_c : public dBgS_MoveBgActor, public request_of_phase_process_cl u32 getType() { return fopAcM_GetParamBit(this, 0, 4); } +private: /* 0x5A8 */ Mtx mMtx[2]; /* 0x608 */ J3DModel* mpModel; /* 0x60C */ s32 field_0x60c; -}; // Size: 0x610 +}; +STATIC_ASSERT(sizeof(daObjKJgjs_c) == 0x610); #endif /* D_A_OBJ_KJGJS_H */ diff --git a/include/rel/d/a/obj/d_a_obj_kkanban/d_a_obj_kkanban.h b/include/rel/d/a/obj/d_a_obj_kkanban/d_a_obj_kkanban.h index 9b9246da97b..4c77b39447f 100644 --- a/include/rel/d/a/obj/d_a_obj_kkanban/d_a_obj_kkanban.h +++ b/include/rel/d/a/obj/d_a_obj_kkanban/d_a_obj_kkanban.h @@ -4,6 +4,14 @@ #include "d/bg/d_bg_s_movebg_actor.h" #include "d/com/d_com_inf_game.h" +/** + * @ingroup actors-objects + * @class daObjKKanban_c + * @brief Kakariko Sign + * + * @details + * + */ class daObjKKanban_c : public dBgS_MoveBgActor { public: /* 80C46768 */ void initBaseMtx(); @@ -28,6 +36,7 @@ class daObjKKanban_c : public dBgS_MoveBgActor { /* 0x74A */ s16 field_0x74a; /* 0x74C */ f32 field_0x74c; /* 0x750 */ s32 field_0x750; -}; // Size: 0x758 +}; +STATIC_ASSERT(sizeof(daObjKKanban_c) == 0x754); #endif /* D_A_OBJ_KKANBAN_H */ diff --git a/include/rel/d/a/obj/d_a_obj_klift00/d_a_obj_klift00.h b/include/rel/d/a/obj/d_a_obj_klift00/d_a_obj_klift00.h index 31078327a19..b7569126ce2 100644 --- a/include/rel/d/a/obj/d_a_obj_klift00/d_a_obj_klift00.h +++ b/include/rel/d/a/obj/d_a_obj_klift00/d_a_obj_klift00.h @@ -1,5 +1,36 @@ #ifndef D_A_OBJ_KLIFT00_H #define D_A_OBJ_KLIFT00_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjKLift00_c + * @brief Water Wheel Lift? + * + * @details + * + */ +class daObjKLift00_c : public fopAc_ac_c { +public: + struct ChainPos { + /* 8058C338 */ ~ChainPos(); + /* 8058C374 */ ChainPos(); + }; + + /* 8058B02C */ void create1st(); + /* 8058B0D0 */ void setMtx(); + /* 8058B4B0 */ void rideActor(fopAc_ac_c*); + /* 8058B5EC */ void CreateHeap(); + /* 8058B77C */ void Create(); + /* 8058B97C */ void Execute(f32 (**)[3][4]); + /* 8058BEEC */ void Draw(); + /* 8058C014 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x1160 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjKLift00_c) == 0x1160); + #endif /* D_A_OBJ_KLIFT00_H */ diff --git a/include/rel/d/a/obj/d_a_obj_knBullet/d_a_obj_knBullet.h b/include/rel/d/a/obj/d_a_obj_knBullet/d_a_obj_knBullet.h index 85a941e3278..fc7e7f6c63e 100644 --- a/include/rel/d/a/obj/d_a_obj_knBullet/d_a_obj_knBullet.h +++ b/include/rel/d/a/obj/d_a_obj_knBullet/d_a_obj_knBullet.h @@ -1,5 +1,31 @@ #ifndef D_A_OBJ_KNBULLET_H #define D_A_OBJ_KNBULLET_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjKnBullet_c + * @brief Hero's Shade Energy Ball? (Knight Bullet) + * + * @details + * + */ +class daObjKnBullet_c : public fopAc_ac_c { +public: + /* 80C47118 */ void Create(); + /* 80C47300 */ void Execute(); + /* 80C47480 */ bool Draw(); + /* 80C47488 */ bool Delete(); + /* 80C47490 */ void setBaseMtx(); + /* 80C474E8 */ void col_init(); + /* 80C47558 */ void col_chk(); + /* 80C477B4 */ void hitPrtclSet(); + +private: + /* 0x568 */ u8 field_0x568[0x71c - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjKnBullet_c) == 0x71c); + #endif /* D_A_OBJ_KNBULLET_H */ diff --git a/include/rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter.h b/include/rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter.h index bc6d65edeb9..eb895411315 100644 --- a/include/rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter.h +++ b/include/rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter.h @@ -1,6 +1,63 @@ #ifndef D_A_OBJ_KSHUTTER_H #define D_A_OBJ_KSHUTTER_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjKshtr_c + * @brief Lakebed Temple Boss Door + * + * @details + * + */ +class daObjKshtr_c : public fopAc_ac_c { +public: + /* 80C47AB8 */ void initBaseMtx(); + /* 80C47B2C */ void setBaseMtx(); + /* 80C47C14 */ void Create(); + /* 80C47E54 */ void offDzb(); + /* 80C47EA8 */ void CreateHeap(); + /* 80C48050 */ void initKey(); + /* 80C48148 */ void phase_0(); + /* 80C4827C */ void phase_1(); + /* 80C48320 */ s32 phase_2(); + /* 80C48328 */ void create1st(); + /* 80C483CC */ void event_proc_call(); + /* 80C48470 */ void event_proc_call2(); + /* 80C4852C */ void Execute(f32 (**)[3][4]); + /* 80C48590 */ void checkArea(); + /* 80C48708 */ void checkOpen(); + /* 80C48798 */ void getDemoAction(); + /* 80C487E0 */ void demoProc2(); + /* 80C489E0 */ void adjustmentProc(); + /* 80C48AC8 */ void keyUnlockInit(); + /* 80C48B84 */ void keyUnlock(); + /* 80C48BD8 */ void openInit(); + /* 80C48D0C */ void openProc(); + /* 80C48D80 */ void openProc_type1(); + /* 80C48F94 */ void openProc_type2(); + /* 80C490F8 */ void openProc_typeL3Boss(); + /* 80C49158 */ void demoProc(); + /* 80C4925C */ void demoJail1(); + /* 80C494A8 */ void demoJail2(); + /* 80C495A4 */ void demoJail11(); + /* 80C496C8 */ bool demoJail21(); + /* 80C496D0 */ void anmInit(); + /* 80C497A0 */ void actionWaitEvent(); + /* 80C49880 */ void actionEvent(); + /* 80C49914 */ void actionDead(); + /* 80C49918 */ void actionWaitEvent2(); + /* 80C499CC */ void actionOpen(); + /* 80C49A08 */ void actionEvent2(); + /* 80C49A70 */ void actionDead2(); + /* 80C49A74 */ void Draw(); + /* 80C49B4C */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x620 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjKshtr_c) == 0x620); + #endif /* D_A_OBJ_KSHUTTER_H */ diff --git a/include/rel/d/a/obj/d_a_obj_ktOnFire/d_a_obj_ktOnFire.h b/include/rel/d/a/obj/d_a_obj_ktOnFire/d_a_obj_ktOnFire.h index 580a6f1d2ff..04ec22bf8a5 100644 --- a/include/rel/d/a/obj/d_a_obj_ktOnFire/d_a_obj_ktOnFire.h +++ b/include/rel/d/a/obj/d_a_obj_ktOnFire/d_a_obj_ktOnFire.h @@ -1,6 +1,40 @@ #ifndef D_A_OBJ_KTONFIRE_H #define D_A_OBJ_KTONFIRE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daKtOnFire_c + * @brief Lantern Fire + * + * @details + * + */ +class daKtOnFire_c : public fopAc_ac_c { +public: + /* 8058C678 */ void setBaseMtx(); + /* 8058C6D0 */ void create(); + /* 8058C960 */ void lightInit(); + /* 8058C9D4 */ void setLight(); + /* 8058C9F8 */ void cutLight(); + /* 8058CA1C */ void Execute(); + /* 8058CDF8 */ bool Draw(); + /* 8058CE00 */ void Delete(); + + static u8 const mCcDObjInfo[48]; + static u8 mCcDCyl[68]; + +private: + /* 0x568 */ u8 field_0x568[0x728 - 0x568]; +}; +STATIC_ASSERT(sizeof(daKtOnFire_c) == 0x728); + +class daKtOnFire_HIO_c { +public: + /* 8058C60C */ daKtOnFire_HIO_c(); + /* 8058CEA8 */ ~daKtOnFire_HIO_c(); +}; + #endif /* D_A_OBJ_KTONFIRE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata.h b/include/rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata.h index 3915451bfc8..e943fdd8ff5 100644 --- a/include/rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata.h +++ b/include/rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata.h @@ -1,5 +1,51 @@ #ifndef D_A_OBJ_KUWAGATA_H #define D_A_OBJ_KUWAGATA_H +#include "d/d_insect.h" + +/** + * @ingroup actors-objects + * @class daObjKUW_c + * @brief Insect - Stag Beetle + * + * @details + * + */ +class daObjKUW_c : public fopAc_ac_c { +public: + /* 80C4A21C */ void InitCcSph(); + /* 80C4A288 */ void SetCcSph(); + /* 80C4A300 */ void CreateHeap(); + /* 80C4A6E4 */ void ShopWaitAction(); + /* 80C4A84C */ void WaitAction(); + /* 80C4A9D0 */ void WallCheck(); + /* 80C4AC44 */ void SpeedSet(); + /* 80C4AD50 */ void WallWalk(); + /* 80C4B1A0 */ void WalkAction(); + /* 80C4B3A0 */ void MoveAction(); + /* 80C4BB88 */ void Action(); + /* 80C4BC4C */ void ShopAction(); + /* 80C4BD08 */ void Insect_Release(); + /* 80C4BD20 */ void Z_BufferChk(); + /* 80C4BE9C */ void ParticleSet(); + /* 80C4BFC0 */ void BoomChk(); + /* 80C4C38C */ void ObjHit(); + /* 80C4C514 */ void Execute(); + /* 80C4C78C */ void Delete(); + /* 80C4C7F4 */ void setBaseMtx(); + /* 80C4C95C */ void CreateChk(); + /* 80C4CB08 */ void create(); + +private: + /* 0x568 */ u8 field_0x568[0xa68 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjKUW_c) == 0xa68); + +class daObj_KuwHIO_c { +public: + /* 80C4A1EC */ daObj_KuwHIO_c(); + /* 80C4D3E8 */ ~daObj_KuwHIO_c(); +}; + #endif /* D_A_OBJ_KUWAGATA_H */ diff --git a/include/rel/d/a/obj/d_a_obj_kwheel00/d_a_obj_kwheel00.h b/include/rel/d/a/obj/d_a_obj_kwheel00/d_a_obj_kwheel00.h index 47aa7f3dd4e..933f7d239b9 100644 --- a/include/rel/d/a/obj/d_a_obj_kwheel00/d_a_obj_kwheel00.h +++ b/include/rel/d/a/obj/d_a_obj_kwheel00/d_a_obj_kwheel00.h @@ -1,5 +1,32 @@ #ifndef D_A_OBJ_KWHEEL00_H #define D_A_OBJ_KWHEEL00_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjKWheel00_c + * @brief Water Wheel 00? + * + * @details + * + */ +class daObjKWheel00_c : public fopAc_ac_c { +public: + /* 80C4D6F8 */ void create1st(); + /* 80C4D86C */ void setMtx(); + /* 80C4D9B8 */ void CreateHeap(); + /* 80C4DA38 */ void Create(); + /* 80C4DBBC */ void Execute(f32 (**)[3][4]); + /* 80C4E1B0 */ void Draw(); + /* 80C4E254 */ void Delete(); + /* 80C4E298 */ void eventStart(); + /* 80C4E6E4 */ ~daObjKWheel00_c(); + +private: + /* 0x568 */ u8 field_0x568[0xb44 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjKWheel00_c) == 0xb44); + #endif /* D_A_OBJ_KWHEEL00_H */ diff --git a/include/rel/d/a/obj/d_a_obj_kwheel01/d_a_obj_kwheel01.h b/include/rel/d/a/obj/d_a_obj_kwheel01/d_a_obj_kwheel01.h index 30505b710d6..70037098915 100644 --- a/include/rel/d/a/obj/d_a_obj_kwheel01/d_a_obj_kwheel01.h +++ b/include/rel/d/a/obj/d_a_obj_kwheel01/d_a_obj_kwheel01.h @@ -1,6 +1,32 @@ #ifndef D_A_OBJ_KWHEEL01_H #define D_A_OBJ_KWHEEL01_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjKWheel01_c + * @brief Water Wheel 01? + * + * @details + * + */ +class daObjKWheel01_c : public fopAc_ac_c { +public: + /* 80C4EA78 */ void create1st(); + /* 80C4EC54 */ void setMtx(); + /* 80C4EDCC */ void CreateHeap(); + /* 80C4EF38 */ void Create(); + /* 80C4F048 */ void Execute(f32 (**)[3][4]); + /* 80C4F344 */ void Draw(); + /* 80C4F3E8 */ void Delete(); + /* 80C4F498 */ void eventStart(); + /* 80C4F60C */ ~daObjKWheel01_c(); + +private: + /* 0x568 */ u8 field_0x568[0x704 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjKWheel01_c) == 0x704); + #endif /* D_A_OBJ_KWHEEL01_H */ diff --git a/include/rel/d/a/obj/d_a_obj_kznkarm/d_a_obj_kznkarm.h b/include/rel/d/a/obj/d_a_obj_kznkarm/d_a_obj_kznkarm.h index 787138f40af..35e22aa795e 100644 --- a/include/rel/d/a/obj/d_a_obj_kznkarm/d_a_obj_kznkarm.h +++ b/include/rel/d/a/obj/d_a_obj_kznkarm/d_a_obj_kznkarm.h @@ -1,6 +1,42 @@ #ifndef D_A_OBJ_KZNKARM_H #define D_A_OBJ_KZNKARM_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjKznkarm_c + * @brief ??? + * + * @details + * + */ +class daObjKznkarm_c : public fopAc_ac_c { +public: + struct Mode_e {}; + + /* 80C4F858 */ void setAction(daObjKznkarm_c::Mode_e); + /* 80C4F88C */ void callInit(); + /* 80C4F8B4 */ void callExecute(); + /* 80C4F8E0 */ void initBroken(); + /* 80C4F960 */ void executeBroken(); + /* 80C4FBBC */ void initCarry(); + /* 80C4FBEC */ void executeCarry(); + /* 80C4FD18 */ void initThrow(); + /* 80C4FDB4 */ void executeThrow(); + /* 80C50488 */ void initStay(); + /* 80C50504 */ void executeStay(); + /* 80C505F8 */ void create_init(); + /* 80C506DC */ void initBaseMtx(); + /* 80C50708 */ void setBaseMtx(); + /* 80C5076C */ void getGroundSlope(s16); + + static u8 const M_attr[56]; + static u8 ActionTable[96]; + +private: + /* 0x568 */ u8 field_0x568[0x7b4 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjKznkarm_c) == 0x7b4); #endif /* D_A_OBJ_KZNKARM_H */ diff --git a/include/rel/d/a/obj/d_a_obj_ladder/d_a_obj_ladder.h b/include/rel/d/a/obj/d_a_obj_ladder/d_a_obj_ladder.h index 0e801f8c6ed..6b25836fce4 100644 --- a/include/rel/d/a/obj/d_a_obj_ladder/d_a_obj_ladder.h +++ b/include/rel/d/a/obj/d_a_obj_ladder/d_a_obj_ladder.h @@ -1,6 +1,61 @@ #ifndef D_A_OBJ_LADDER_H #define D_A_OBJ_LADDER_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjLadder + * @brief Ladder + * + * @details + * + */ +class daObjLadder : public fopAc_ac_c { +public: + class Act_c { + public: + struct Prm_e {}; + + /* 8058D158 */ void CreateHeap(); + /* 8058D1D8 */ void Create(); + /* 8058D378 */ void Mthd_Create(); + /* 8058D4F0 */ bool Delete(); + /* 8058D4F8 */ void Mthd_Delete(); + /* 8058D544 */ void demo_end_reset(); + /* 8058D5AC */ void mode_wait_init(); + /* 8058D5B8 */ void mode_wait(); + /* 8058D614 */ void mode_demoreq_init(); + /* 8058D628 */ void mode_demoreq(); + /* 8058D6E8 */ void mode_vib_init(); + /* 8058D710 */ void mode_vib(); + /* 8058D7A8 */ void mode_drop_init(); + /* 8058D7EC */ void mode_drop(); + /* 8058D9C0 */ void mode_fell_init(); + /* 8058D9CC */ void mode_fell(); + /* 8058D9D0 */ void set_mtx(); + /* 8058DA64 */ void init_mtx(); + /* 8058DAA0 */ void Execute(f32 (**)[3][4]); + /* 8058DBB8 */ void Draw(); + + static u8 const M_arcname[5 + 3 /* padding */]; + static u8 M_tmp_mtx[48]; + }; + +private: + /* 0x568 */ u8 field_0x568[0x620 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjLadder) == 0x620); + +struct daObj { +public: + /* 800373C0 */ void posMoveF_stream(fopAc_ac_c*, cXyz const*, cXyz const*, f32, f32); + template + void PrmAbstract(/* ... */); + /* 8058DD14 */ /* daObj::PrmAbstract */ + void func_8058DD14(void* _this, fopAc_ac_c const*, daObjLadder::Act_c::Prm_e, + daObjLadder::Act_c::Prm_e); +}; + #endif /* D_A_OBJ_LADDER_H */ diff --git a/include/rel/d/a/obj/d_a_obj_laundry/d_a_obj_laundry.h b/include/rel/d/a/obj/d_a_obj_laundry/d_a_obj_laundry.h index 91e331da6ec..3b9ba8f4be7 100644 --- a/include/rel/d/a/obj/d_a_obj_laundry/d_a_obj_laundry.h +++ b/include/rel/d/a/obj/d_a_obj_laundry/d_a_obj_laundry.h @@ -1,5 +1,37 @@ #ifndef D_A_OBJ_LAUNDRY_H #define D_A_OBJ_LAUNDRY_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjLdy_c + * @brief Laundry + * + * @details + * + */ +class daObjLdy_c : public fopAc_ac_c { +public: + /* 80C50F98 */ void create_init(); + /* 80C51088 */ void initBaseMtx(); + /* 80C510F8 */ void setBaseMtx(); + /* 80C5116C */ void getJointAngle(csXyz*, int); + /* 80C51194 */ void setNormalClothPos(); + /* 80C51644 */ void calcJointAngle(); + /* 80C5183C */ bool divorceParent(); + + static u8 const M_attr[52]; +private: + /* 0x568 */ u8 field_0x568[0x7c8 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjLdy_c) == 0x7c8); + +class LaundJoint_c { +public: + /* 80C51D2C */ ~LaundJoint_c(); + /* 80C51EC0 */ LaundJoint_c(); +}; + #endif /* D_A_OBJ_LAUNDRY_H */ diff --git a/include/rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope.h b/include/rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope.h index b8c9910f05e..68be77cb630 100644 --- a/include/rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope.h +++ b/include/rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope.h @@ -1,5 +1,29 @@ #ifndef D_A_OBJ_LAUNDRY_ROPE_H #define D_A_OBJ_LAUNDRY_ROPE_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjLndRope_c + * @brief Laundry Rope + * + * @details + * + */ +class daObjLndRope_c : public fopAc_ac_c { +public: + /* 80C521F8 */ void create_init(); + /* 80C5285C */ void initBaseMtx(); + /* 80C52890 */ void setBaseMtx(); + /* 80C528E0 */ void setNormalRopePos(); + + static u8 const M_attr[20]; + +private: + /* 0x568 */ u8 field_0x568[0x1774 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjLndRope_c) == 0x1774); + #endif /* D_A_OBJ_LAUNDRY_ROPE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.h b/include/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.h index be66515aaff..b7ff261eec6 100644 --- a/include/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.h +++ b/include/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.h @@ -7,6 +7,14 @@ #include "d/bg/d_bg_s_acch.h" #include "d/cc/d_cc_d.h" +/** + * @ingroup actors-objects + * @class obj_lbox_class + * @brief L - Box (Large Box?) + * + * @details + * + */ class obj_lbox_class : public fopAc_ac_c { public: /* 0x568 */ request_of_phase_process_class mPhaseReq; @@ -28,7 +36,8 @@ class obj_lbox_class : public fopAc_ac_c { /* 0xA84 */ u32 field_0xa84; /* 0xA88 */ u32 field_0xa88; /* 0xA8C */ u8 field_0xa8c; -}; // Size = 0xA90 +}; +STATIC_ASSERT(sizeof(obj_lbox_class) == 0xA90); class daObj_Lbox_HIO_c { public: diff --git a/include/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.h b/include/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.h index 41755394e8d..88c32a63439 100644 --- a/include/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.h +++ b/include/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.h @@ -1,5 +1,47 @@ #ifndef D_A_OBJ_LIFE_CONTAINER_H #define D_A_OBJ_LIFE_CONTAINER_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjLife_c + * @brief Heart Piece + * + * @details + * + */ +class daObjLife_c : public fopAc_ac_c { +public: + /* 804CCBE4 */ void initBaseMtx(); + /* 804CCC04 */ void setBaseMtx(); + /* 804CCC6C */ void Create(); + /* 804CCE00 */ void setEffect(); + /* 804CCF5C */ void endEffect00(); + /* 804CCFAC */ void endEffect02(); + /* 804CCFD8 */ bool __CreateHeap(); + /* 804CCFE0 */ void create(); + /* 804CD428 */ void bg_check(); + /* 804CD5B8 */ void actionWaitInit(); + /* 804CD660 */ void actionWait(); + /* 804CD8C0 */ void initActionOrderGetDemo(); + /* 804CD98C */ void actionOrderGetDemo(); + /* 804CDA08 */ void actionGetDemo(); + /* 804CDBC8 */ void actionSwOnWait(); + /* 804CDC2C */ void actionInitBoomerangCarry(); + /* 804CDD0C */ void actionBoomerangCarry(); + /* 804CDD7C */ void actionInitWait2(); + /* 804CDD8C */ void actionWait2(); + /* 804CDDAC */ void calcScale(); + /* 804CDE70 */ void execute(); + /* 804CE19C */ void draw(); + /* 804CE1F0 */ void setListStart(); + /* 804CE214 */ void _delete(); + +private: + /* 0x568 */ u8 field_0x568[0x9d4 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjLife_c) == 0x9d4); + #endif /* D_A_OBJ_LIFE_CONTAINER_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.h b/include/rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.h index 6d4c3ba2e77..ea90681e1fc 100644 --- a/include/rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.h +++ b/include/rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.h @@ -1,6 +1,27 @@ #ifndef D_A_OBJ_LP_H #define D_A_OBJ_LP_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +struct wd_ss { +public: + /* 80C559C8 */ ~wd_ss(); + /* 80C55A04 */ wd_ss(); +}; + +/** + * @ingroup actors-objects + * @class obj_lp_class + * @brief Lily Pad + * + * @details + * + */ +class obj_lp_class : public fopAc_ac_c { +private: + /* 0x568 */ u8 field_0x568[0xadb8 - 0x568]; +}; +STATIC_ASSERT(sizeof(obj_lp_class) == 0xadb8); + #endif /* D_A_OBJ_LP_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.h b/include/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.h index 87df9eea6e7..c335738533c 100644 --- a/include/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.h +++ b/include/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.h @@ -6,15 +6,16 @@ #include "d/cc/d_cc_d.h" #include "m_Do/m_Do_hostIO.h" -class daLv1Cdl00_HIO_c : public mDoHIO_entry_c { -public: - /* 80C55D0C */ daLv1Cdl00_HIO_c(); - /* 80C56970 */ ~daLv1Cdl00_HIO_c() {} - /* 0x4 */ u8 field_0x4; - /* 0x5 */ u8 field_0x5; -}; +/** + * @ingroup actors-objects + * @class daLv1Cdl00_c + * @brief Forest Temple Torch 00 + * + * @details + * + */ class daLv1Cdl00_c : public fopAc_ac_c { public: /* 80C55D80 */ void setBaseMtx(); @@ -29,6 +30,7 @@ class daLv1Cdl00_c : public fopAc_ac_c { /* 80C567EC */ int Draw(); /* 80C56890 */ int Delete(); +private: /* 0x568 */ request_of_phase_process_class mPhase; /* 0x570 */ J3DModel* mpModel; /* 0x574 */ dCcD_Stts mStts; @@ -50,4 +52,13 @@ class daLv1Cdl00_c : public fopAc_ac_c { STATIC_ASSERT(sizeof(daLv1Cdl00_c) == 0x754); +class daLv1Cdl00_HIO_c : public mDoHIO_entry_c { +public: + /* 80C55D0C */ daLv1Cdl00_HIO_c(); + /* 80C56970 */ ~daLv1Cdl00_HIO_c() {} + + /* 0x4 */ u8 field_0x4; + /* 0x5 */ u8 field_0x5; +}; + #endif /* D_A_OBJ_LV1CANDLE00_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.h b/include/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.h index 11ece325056..4b34895e7e1 100644 --- a/include/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.h +++ b/include/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.h @@ -6,15 +6,14 @@ #include "d/cc/d_cc_d.h" #include "m_Do/m_Do_hostIO.h" -class daLv1Cdl01_HIO_c : public mDoHIO_entry_c { -public: - /* 80C56CAC */ daLv1Cdl01_HIO_c(); - /* 80C5777C */ ~daLv1Cdl01_HIO_c() {} - - /* 0x4 */ u8 field_0x4; - /* 0x5 */ u8 field_0x5; -}; - +/** + * @ingroup actors-objects + * @class daLv1Cdl01_c + * @brief Forest Temple Torch 01 + * + * @details + * + */ class daLv1Cdl01_c : public dBgS_MoveBgActor { public: /* 80C56D20 */ void setBaseMtx(); @@ -28,6 +27,7 @@ class daLv1Cdl01_c : public dBgS_MoveBgActor { /* 80C575F4 */ int Draw(); /* 80C57698 */ int Delete(); +private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ dCcD_Stts mStts; @@ -48,4 +48,13 @@ class daLv1Cdl01_c : public dBgS_MoveBgActor { STATIC_ASSERT(sizeof(daLv1Cdl01_c) == 0x78C); +class daLv1Cdl01_HIO_c : public mDoHIO_entry_c { +public: + /* 80C56CAC */ daLv1Cdl01_HIO_c(); + /* 80C5777C */ ~daLv1Cdl01_HIO_c() {} + + /* 0x4 */ u8 field_0x4; + /* 0x5 */ u8 field_0x5; +}; + #endif /* D_A_OBJ_LV1CANDLE01_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle.h b/include/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle.h index 03f56d0c72a..95fe393c51b 100644 --- a/include/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle.h +++ b/include/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle.h @@ -5,24 +5,15 @@ #include "m_Do/m_Do_hostIO.h" #include "rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.h" -class daLv2Candle_HIO_c : public mDoHIO_entry_c { -public: - /* 8058E04C */ daLv2Candle_HIO_c(); - /* 8058F050 */ ~daLv2Candle_HIO_c() {} - - /* 0x04 */ u8 mTimer; - /* 0x08 */ f32 mPow; - /* 0x0C */ f32 mAnmMaxStep; - /* 0x10 */ f32 mAnmIntensity[6]; - /* 0x28 */ u8 mAnmTimers[6]; - /* 0x2E */ u8 mColor1R; - /* 0x2F */ u8 mColor1G; - /* 0x30 */ u8 mColor1B; - /* 0x31 */ u8 mColor2R; - /* 0x32 */ u8 mColor2G; - /* 0x33 */ u8 mColor2B; -}; +/** + * @ingroup actors-objects + * @class daLv2Candle_c + * @brief Goron Mines Torch + * + * @details + * + */ class daLv2Candle_c : public fopAc_ac_c { public: /* 8058E13C */ void setBaseMtx(); @@ -46,6 +37,7 @@ class daLv2Candle_c : public fopAc_ac_c { u8 getSwType() { return fopAcM_GetParamBit(this, 8, 4); } u8 getSw() { return fopAcM_GetParamBit(this, 0, 8); } +private: /* 0x568 */ request_of_phase_process_class mPhase; /* 0x570 */ J3DModel* mpModel; /* 0x574 */ dCcD_Stts mStts; @@ -74,4 +66,22 @@ class daLv2Candle_c : public fopAc_ac_c { STATIC_ASSERT(sizeof(daLv2Candle_c) == 0x75C); +class daLv2Candle_HIO_c : public mDoHIO_entry_c { +public: + /* 8058E04C */ daLv2Candle_HIO_c(); + /* 8058F050 */ ~daLv2Candle_HIO_c() {} + + /* 0x04 */ u8 mTimer; + /* 0x08 */ f32 mPow; + /* 0x0C */ f32 mAnmMaxStep; + /* 0x10 */ f32 mAnmIntensity[6]; + /* 0x28 */ u8 mAnmTimers[6]; + /* 0x2E */ u8 mColor1R; + /* 0x2F */ u8 mColor1G; + /* 0x30 */ u8 mColor1B; + /* 0x31 */ u8 mColor2R; + /* 0x32 */ u8 mColor2G; + /* 0x33 */ u8 mColor2B; +}; + #endif /* D_A_OBJ_LV2CANDLE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv3Candle/d_a_obj_lv3Candle.h b/include/rel/d/a/obj/d_a_obj_lv3Candle/d_a_obj_lv3Candle.h index 343c74ce146..0a6c002a861 100644 --- a/include/rel/d/a/obj/d_a_obj_lv3Candle/d_a_obj_lv3Candle.h +++ b/include/rel/d/a/obj/d_a_obj_lv3Candle/d_a_obj_lv3Candle.h @@ -5,15 +5,15 @@ #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_hostIO.h" -class daLv3Candle_HIO_c : public mDoHIO_entry_c { -public: - /* 80C57ACC */ daLv3Candle_HIO_c(); - /* 80C58484 */ virtual ~daLv3Candle_HIO_c() {} - - /* 0x00 vtable */ - /* 0x04 */ u8 field_0x04; -}; +/** + * @ingroup actors-objects + * @class daLv3Candle_c + * @brief Lakebed Temple Torch + * + * @details + * + */ class daLv3Candle_c : public fopAc_ac_c { public: /* 80C57B38 */ void setBaseMtx(); @@ -29,6 +29,7 @@ class daLv3Candle_c : public fopAc_ac_c { u8 getSwBit() { return fopAcM_GetParamBit(this, 0, 8); } u8 getType() { return fopAcM_GetParamBit(this, 8, 8); } +private: /* 0x568 */ request_of_phase_process_class mPhaseReq; /* 0x570 */ J3DModel* mpModel; /* 0x574 */ u8 mType; @@ -50,4 +51,13 @@ class daLv3Candle_c : public fopAc_ac_c { STATIC_ASSERT(sizeof(daLv3Candle_c) == 0x754); +class daLv3Candle_HIO_c : public mDoHIO_entry_c { +public: + /* 80C57ACC */ daLv3Candle_HIO_c(); + /* 80C58484 */ virtual ~daLv3Candle_HIO_c() {} + + /* 0x00 vtable */ + /* 0x04 */ u8 field_0x04; +}; + #endif /* D_A_OBJ_LV3CANDLE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv3Water/d_a_obj_lv3Water.h b/include/rel/d/a/obj/d_a_obj_lv3Water/d_a_obj_lv3Water.h index db80ff490a0..8609030bc4c 100644 --- a/include/rel/d/a/obj/d_a_obj_lv3Water/d_a_obj_lv3Water.h +++ b/include/rel/d/a/obj/d_a_obj_lv3Water/d_a_obj_lv3Water.h @@ -1,6 +1,41 @@ #ifndef D_A_OBJ_LV3WATER_H #define D_A_OBJ_LV3WATER_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daLv3Water_c + * @brief Lakebed Temple Water + * + * @details + * + */ +class daLv3Water_c : public fopAc_ac_c { +public: + /* 80C58838 */ void setBaseMtx(); + /* 80C5891C */ void CreateHeap(); + /* 80C58ABC */ void create(); + /* 80C58D68 */ void Execute(f32 (**)[3][4]); + /* 80C58E20 */ void effectSet(); + /* 80C596F4 */ void mode_proc_wait(); + /* 80C59754 */ void mode_init_levelCtrl(); + /* 80C597FC */ void mode_proc_levelCtrl(); + /* 80C598BC */ void Draw(); + /* 80C59AA0 */ void Delete(); + /* 80C59AE0 */ void eventStart(); + /* 80C59D80 */ ~daLv3Water_c(); + +private: + /* 0x568 */ u8 field_0x568[0x628 - 0x568]; +}; +STATIC_ASSERT(sizeof(daLv3Water_c) == 0x628); + +class daLv3Water_HIO_c { +public: + /* 80C587CC */ daLv3Water_HIO_c(); + /* 80C59C34 */ ~daLv3Water_HIO_c(); +}; + #endif /* D_A_OBJ_LV3WATER_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv3Water2/d_a_obj_lv3Water2.h b/include/rel/d/a/obj/d_a_obj_lv3Water2/d_a_obj_lv3Water2.h index 50fb59a886e..ad61d3967e1 100644 --- a/include/rel/d/a/obj/d_a_obj_lv3Water2/d_a_obj_lv3Water2.h +++ b/include/rel/d/a/obj/d_a_obj_lv3Water2/d_a_obj_lv3Water2.h @@ -1,6 +1,40 @@ #ifndef D_A_OBJ_LV3WATER2_H #define D_A_OBJ_LV3WATER2_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daLv3Water2_c + * @brief Lakebed Temple Water 2 + * + * @details + * + */ +class daLv3Water2_c : public fopAc_ac_c { +public: + /* 80C5A478 */ void setBaseMtx(); + /* 80C5A4F8 */ void CreateHeap(); + /* 80C5A5E4 */ void create(); + /* 80C5A844 */ void Execute(f32 (**)[3][4]); + /* 80C5AC10 */ void mode_proc_wait(); + /* 80C5ACB8 */ void mode_init_levelCtrl(); + /* 80C5ACE4 */ void mode_proc_levelCtrl(); + /* 80C5ADA4 */ void Draw(); + /* 80C5AEFC */ void Delete(); + /* 80C5AF3C */ void eventStart(); + /* 80C5B298 */ ~daLv3Water2_c(); + +private: + /* 0x568 */ u8 field_0x568[0x610 - 0x568]; +}; +STATIC_ASSERT(sizeof(daLv3Water2_c) == 0x610); + +class daLv3Water2_HIO_c { +public: + /* 80C5A40C */ daLv3Water2_HIO_c(); + /* 80C5B14C */ ~daLv3Water2_HIO_c(); +}; + #endif /* D_A_OBJ_LV3WATER2_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.h b/include/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.h index 31dfebae432..0946d244c2a 100644 --- a/include/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.h +++ b/include/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.h @@ -9,6 +9,14 @@ enum obj_lv3waterB_action { LV3WATERB_ACT_END, }; +/** + * @ingroup actors-objects + * @class obj_lv3WaterB_class + * @brief Lakebed Temple Water (Boss) + * + * @details + * + */ class obj_lv3WaterB_class : public fopAc_ac_c { public: /* 0x568 */ request_of_phase_process_class mBWaterPhase; @@ -25,5 +33,6 @@ class obj_lv3WaterB_class : public fopAc_ac_c { /* 0x5C4 */ Mtx mpOctHibiMtx; /* 0x5F4 */ dBgW* mpOctHibiBgW; }; +STATIC_ASSERT(sizeof(obj_lv3WaterB_class) == 0x5F8); #endif /* D_A_OBJ_LV3WATERB_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.h b/include/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.h index 095211074a9..9fe34f6cf4b 100644 --- a/include/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.h +++ b/include/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.h @@ -4,6 +4,14 @@ #include "d/bg/d_bg_s_movebg_actor.h" #include "f_op/f_op_actor_mng.h" +/** + * @ingroup actors-objects + * @class daObjLv3saka_c + * @brief Lakebed Temple Spiral 00 + * + * @details + * + */ class daObjLv3saka_c : public dBgS_MoveBgActor { public: /* 80C5BE58 */ void initBaseMtx(); @@ -20,6 +28,7 @@ class daObjLv3saka_c : public dBgS_MoveBgActor { u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8) & 0xFF; } u8 getType() { return fopAcM_GetParamBit(this, 28, 4) & 0xFF; } +private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ dBgW* mpBgW2; }; diff --git a/include/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.h b/include/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.h index e8064a88899..e86ff57680e 100644 --- a/include/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.h +++ b/include/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.h @@ -3,6 +3,14 @@ #include "f_op/f_op_actor_mng.h" +/** + * @ingroup actors-objects + * @class daObjWaterEff_c + * @brief Room 09 Water + * + * @details + * + */ class daObjWaterEff_c : public fopAc_ac_c { public: /* 80C5C4F8 */ int Create(); @@ -10,9 +18,11 @@ class daObjWaterEff_c : public fopAc_ac_c { /* 80C5C6B0 */ int execute(); /* 80C5C7B8 */ int _delete(); +private: /* 0x568 */ cXyz mSePositions[2]; /* 0x580 */ JPABaseEmitter* mParticles[4]; /* 0x590 */ u8 unused_0x590[0x594 - 0x590]; }; +STATIC_ASSERT(sizeof(daObjWaterEff_c) == 0x594); #endif /* D_A_OBJ_LV3WATEREFF_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.h b/include/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.h index 414287a6321..fc89caa210d 100644 --- a/include/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.h +++ b/include/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.h @@ -1,5 +1,70 @@ #ifndef D_A_OBJ_LV4CANDLEDEMOTAG_H #define D_A_OBJ_LV4CANDLEDEMOTAG_H +#include "f_op/f_op_actor_mng.h" +#include "d/event/d_event_lib.h" +#include "rel/d/a/obj/d_a_obj_lv4EdShutter/d_a_obj_lv4EdShutter.h" + +// idk how this works atm. dEvLib_callback_c seems to need to be inherited, but this data comes +// before it. the fopAc_ac_c struct size is 100% correct, so do not change it +struct temp { + /* 0x568 */ u8 field_0x568[0x570 - 0x568]; +}; + +/** + * @ingroup actors-objects + * @class dalv4CandleDemoTag_c + * @brief Arbiter's Grounds Torch Cutscene Tag + * + * @details + * + */ +class dalv4CandleDemoTag_c : public fopAc_ac_c, temp, public dEvLib_callback_c { +public: + dalv4CandleDemoTag_c() : dEvLib_callback_c(this) {} + + /* 80C5CA58 */ void setBaseMtx(); + /* 80C5CA90 */ int create(); + /* 80C5CBA4 */ int Execute(); + /* 80C5CBE8 */ void procMain(); + /* 80C5CCA4 */ void init_modeWatch(); + /* 80C5CCC0 */ void modeWatch(); + /* 80C5CDC0 */ void init_modeEnemyCreate(); + /* 80C5CE70 */ void modeEnemyCreate(); + /* 80C5CEB4 */ void init_modeNG(); + /* 80C5CEC0 */ void modeNG(); + /* 80C5CF34 */ void init_modeEnd(); + /* 80C5CF40 */ void modeEnd(); + /* 80C5CF9C */ static void* searchShutterAct(void*, void*); + /* 80C5CFEC */ int Draw(); + /* 80C5CFF4 */ int Delete(); + + u8 getPathID() { return fopAcM_GetParamBit(this, 0x10, 8); } + int getSwNG() { return fopAcM_GetParamBit(this, 0, 8); } + int getSwDest() { return fopAcM_GetParamBit(this, 8, 8); } + int getSwOK() { return shape_angle.x & 0xFF; } + int getEventID() { return fopAcM_GetParamBit(this, 0x18, 8); } + + /* 80C5D184 */ virtual ~dalv4CandleDemoTag_c(); + /* 80C5CF78 */ virtual BOOL eventStart(); + +private: + /* 0x584 */ u8 mMode; + /* 0x585 */ u8 mPathID; + /* 0x586 */ u8 mSwNG; + /* 0x587 */ u8 mSwDest; + /* 0x588 */ u16 mEnemyWaitTime; + /* 0x58C */ daLv4EdShutter_c* mpShutterActor; +}; +STATIC_ASSERT(sizeof(dalv4CandleDemoTag_c) == 0x590); + +class dalv4CandleDemoTag_HIO_c : public mDoHIO_entry_c { +public: + /* 80C5C9EC */ dalv4CandleDemoTag_HIO_c(); + /* 80C5D07C */ virtual ~dalv4CandleDemoTag_HIO_c(); + + /* 0x4 */ s16 mEnemyWaitTime; +}; + #endif /* D_A_OBJ_LV4CANDLEDEMOTAG_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.h b/include/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.h index 47866d3aed9..6b24062d53f 100644 --- a/include/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.h +++ b/include/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.h @@ -11,6 +11,14 @@ struct unknown { // dalv4CandleTag_c should inherit fopAc_ac_c, unknown, and dEvLib_callback_c // but this causes issues with weak function ordering +/** + * @ingroup actors-objects + * @class dalv4CandleTag_c + * @brief Arbiter's Grounds Torch Tag + * + * @details + * + */ class dalv4CandleTag_c : public fopAc_ac_c { public: enum Mode { diff --git a/include/rel/d/a/obj/d_a_obj_lv4EdShutter/d_a_obj_lv4EdShutter.h b/include/rel/d/a/obj/d_a_obj_lv4EdShutter/d_a_obj_lv4EdShutter.h index e5d34b6597c..a3d9ac9ae91 100644 --- a/include/rel/d/a/obj/d_a_obj_lv4EdShutter/d_a_obj_lv4EdShutter.h +++ b/include/rel/d/a/obj/d_a_obj_lv4EdShutter/d_a_obj_lv4EdShutter.h @@ -1,6 +1,50 @@ #ifndef D_A_OBJ_LV4EDSHUTTER_H #define D_A_OBJ_LV4EDSHUTTER_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daLv4EdShutter_c + * @brief Arbiter's Grounds Death Sword Gate + * + * @details + * + */ +class daLv4EdShutter_c : public fopAc_ac_c { +public: + /* 80C5DE38 */ void setBaseMtx(); + /* 80C5DEC8 */ void CreateHeap(); + /* 80C5DF34 */ void create(); + /* 80C5E0A4 */ void Execute(f32 (**)[3][4]); + /* 80C5E0F4 */ void move(); + /* 80C5E1B0 */ void init_modeWait(); + /* 80C5E1C8 */ void modeWait(); + /* 80C5E2E0 */ void init_modeOpen(); + /* 80C5E394 */ void modeOpen(); + /* 80C5E464 */ void init_modeClose(); + /* 80C5E518 */ void modeClose(); + /* 80C5E584 */ void init_modeEnd(); + /* 80C5E590 */ void modeEnd(); + /* 80C5E594 */ void eventStart(); + /* 80C5E5CC */ void Draw(); + /* 80C5E670 */ void Delete(); + /* 80C5E834 */ ~daLv4EdShutter_c(); + + u8 getStatus() { return mStatus; } + +private: + /* 0x568 */ u8 field_0x568[0x5CA - 0x568]; + /* 0x5CA */ u8 mStatus; + /* 0x5CB */ u8 field_0x56B[0x5DC - 0x5CB]; +}; +STATIC_ASSERT(sizeof(daLv4EdShutter_c) == 0x5dc); + +class daLv4EdShutter_HIO_c { +public: + /* 80C5DDAC */ daLv4EdShutter_HIO_c(); + /* 80C5E72C */ ~daLv4EdShutter_HIO_c(); +}; + #endif /* D_A_OBJ_LV4EDSHUTTER_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate.h b/include/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate.h index bd7e1ab36bf..bf641548694 100644 --- a/include/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate.h +++ b/include/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate.h @@ -5,6 +5,14 @@ #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_hostIO.h" +/** + * @ingroup actors-objects + * @class daLv4Gate_c + * @brief Arbiter's Grounds Gate + * + * @details + * + */ class daLv4Gate_c : public dBgS_MoveBgActor { public: enum Mode_e { diff --git a/include/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.h b/include/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.h index ff4f82776fc..48ff469bdc6 100644 --- a/include/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.h +++ b/include/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.h @@ -5,6 +5,14 @@ #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_hostIO.h" +/** + * @ingroup actors-objects + * @class daLv4HsTarget_c + * @brief Arbiter's Grounds Clawshot Target + * + * @details + * + */ class daLv4HsTarget_c : public dBgS_MoveBgActor { public: /* 80C5F690 */ void setBaseMtx(); @@ -15,9 +23,11 @@ class daLv4HsTarget_c : public dBgS_MoveBgActor { /* 80C5F870 */ virtual int Draw(); /* 80C5F8D4 */ virtual int Delete(); +private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mpModel; }; +STATIC_ASSERT(sizeof(daLv4HsTarget_c) == 0x5AC); class daLv4HsTarget_HIO_c : public mDoHIO_entry_c { public: diff --git a/include/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.h b/include/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.h index c2972353a5d..ccf75b31410 100644 --- a/include/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.h +++ b/include/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.h @@ -5,23 +5,14 @@ #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_hostIO.h" -class daLv4PoGate_HIO_c : public mDoHIO_entry_c { -public: - /* 80C5FBEC */ daLv4PoGate_HIO_c(); - /* 80C60758 */ virtual ~daLv4PoGate_HIO_c() {}; - - /* 0x04 */ f32 mOpenSpeed; - /* 0x08 */ f32 mCloseStep1Speed; - /* 0x0C */ f32 mCloseStep2Speed; - /* 0x10 */ f32 mCloseStep1Amount; - /* 0x14 */ f32 mCloseStep2Amount; - /* 0x18 */ u8 mCloseStep1Wait; - /* 0x19 */ u8 mCloseStep2Wait; - /* 0x1C */ f32 mCloseStep3Speed; - /* 0x20 */ f32 mCloseStep3Max; - /* 0x24 */ u8 mShockStrength; -}; - +/** + * @ingroup actors-objects + * @class daLv4PoGate_c + * @brief Arbiter's Grounds Poe Gate + * + * @details + * + */ class daLv4PoGate_c : public dBgS_MoveBgActor { public: enum Mode_e { @@ -61,6 +52,7 @@ class daLv4PoGate_c : public dBgS_MoveBgActor { int getSw() { return fopAcM_GetParamBit(this, 0, 8); } +private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ u8 mMode; @@ -70,5 +62,23 @@ class daLv4PoGate_c : public dBgS_MoveBgActor { /* 0x5B4 */ f32 mMoveValue; /* 0x5B8 */ u8 mCloseWaitTime; }; +STATIC_ASSERT(sizeof(daLv4PoGate_c) == 0x5BC); + +class daLv4PoGate_HIO_c : public mDoHIO_entry_c { +public: + /* 80C5FBEC */ daLv4PoGate_HIO_c(); + /* 80C60758 */ virtual ~daLv4PoGate_HIO_c() {}; + + /* 0x04 */ f32 mOpenSpeed; + /* 0x08 */ f32 mCloseStep1Speed; + /* 0x0C */ f32 mCloseStep2Speed; + /* 0x10 */ f32 mCloseStep1Amount; + /* 0x14 */ f32 mCloseStep2Amount; + /* 0x18 */ u8 mCloseStep1Wait; + /* 0x19 */ u8 mCloseStep2Wait; + /* 0x1C */ f32 mCloseStep3Speed; + /* 0x20 */ f32 mCloseStep3Max; + /* 0x24 */ u8 mShockStrength; +}; #endif /* D_A_OBJ_LV4POGATE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall.h b/include/rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall.h index d8567d8a7eb..63a6d292813 100644 --- a/include/rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall.h +++ b/include/rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall.h @@ -1,6 +1,40 @@ #ifndef D_A_OBJ_LV4RAILWALL_H #define D_A_OBJ_LV4RAILWALL_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjLv4Wall_c + * @brief Arbiters Grounds Spinner Rail Wall (Stallord Arena) + * + * @details + * + */ +class daObjLv4Wall_c : public fopAc_ac_c { +public: + /* 80C60AC4 */ void initBaseMtx(); + /* 80C60B00 */ void setBaseMtx(); + /* 80C60B7C */ void Create(); + /* 80C60CD0 */ void CreateHeap(); + /* 80C60D40 */ void create1st(); + /* 80C60DC4 */ void Execute(f32 (**)[3][4]); + /* 80C60E90 */ void action(); + /* 80C60F4C */ void mode_init_wait(); + /* 80C60F58 */ void mode_wait(); + /* 80C61004 */ void mode_init_move(); + /* 80C61068 */ void mode_move(); + /* 80C613C0 */ void mode_init_dead(); + /* 80C613CC */ void mode_dead(); + /* 80C613D0 */ void eventStart(); + /* 80C6143C */ void Draw(); + /* 80C614E0 */ void Delete(); + /* 80C61940 */ ~daObjLv4Wall_c(); + +private: + /* 0x568 */ u8 field_0x568[0x95c - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjLv4Wall_c) == 0x95c); + #endif /* D_A_OBJ_LV4RAILWALL_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv4SlideWall/d_a_obj_lv4SlideWall.h b/include/rel/d/a/obj/d_a_obj_lv4SlideWall/d_a_obj_lv4SlideWall.h index 8c7064ef0ec..068629fc920 100644 --- a/include/rel/d/a/obj/d_a_obj_lv4SlideWall/d_a_obj_lv4SlideWall.h +++ b/include/rel/d/a/obj/d_a_obj_lv4SlideWall/d_a_obj_lv4SlideWall.h @@ -1,6 +1,43 @@ #ifndef D_A_OBJ_LV4SLIDEWALL_H #define D_A_OBJ_LV4SLIDEWALL_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daSldWall_c + * @brief Arbiter's Grounds Sliding Wall + * + * @details + * + */ +class daSldWall_c : public fopAc_ac_c { +public: + /* 80C61EB0 */ void setBaseMtx(); + /* 80C61F4C */ void CreateHeap(); + /* 80C61FB8 */ void create(); + /* 80C620E4 */ void Execute(f32 (**)[3][4]); + /* 80C62134 */ void moveWall(); + /* 80C62238 */ void init_modeWait(); + /* 80C62244 */ void modeWait(); + /* 80C62248 */ void init_modeMoveOpen(); + /* 80C62254 */ void modeMoveOpen(); + /* 80C62314 */ void init_modeMoveClose(); + /* 80C62320 */ void modeMoveClose(); + /* 80C623E0 */ void setSe(); + /* 80C6249C */ void Draw(); + /* 80C62540 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x5b4 - 0x568]; +}; +STATIC_ASSERT(sizeof(daSldWall_c) == 0x5b4); + +class daSldWall_HIO_c { +public: + /* 80C61E2C */ daSldWall_HIO_c(); + /* 80C625FC */ ~daSldWall_HIO_c(); +}; + #endif /* D_A_OBJ_LV4SLIDEWALL_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv4bridge/d_a_obj_lv4bridge.h b/include/rel/d/a/obj/d_a_obj_lv4bridge/d_a_obj_lv4bridge.h index b1227301cc0..eb8d20dd647 100644 --- a/include/rel/d/a/obj/d_a_obj_lv4bridge/d_a_obj_lv4bridge.h +++ b/include/rel/d/a/obj/d_a_obj_lv4bridge/d_a_obj_lv4bridge.h @@ -1,6 +1,40 @@ #ifndef D_A_OBJ_LV4BRIDGE_H #define D_A_OBJ_LV4BRIDGE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjLv4Brg_c + * @brief Arbiter's Grounds Bridge + * + * @details + * + */ +class daObjLv4Brg_c : public fopAc_ac_c { +public: + /* 80C62878 */ void initBaseMtx(); + /* 80C628B4 */ void setBaseMtx(); + /* 80C62994 */ void Create(); + /* 80C62A2C */ void CreateHeap(); + /* 80C62A9C */ void create1st(); + /* 80C62B20 */ void Execute(f32 (**)[3][4]); + /* 80C62B6C */ void action(); + /* 80C62C28 */ void mode_init_wait(); + /* 80C62C34 */ void mode_wait(); + /* 80C62CE4 */ void mode_init_move(); + /* 80C62CFC */ void mode_move(); + /* 80C62E24 */ void mode_init_dead(); + /* 80C62E30 */ void mode_dead(); + /* 80C62E34 */ void eventStart(); + /* 80C62EA0 */ void Draw(); + /* 80C62F44 */ void Delete(); + /* 80C630C4 */ ~daObjLv4Brg_c(); + +private: + /* 0x568 */ u8 field_0x568[0x5d0 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjLv4Brg_c) == 0x5d0); + #endif /* D_A_OBJ_LV4BRIDGE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv4chandelier/d_a_obj_lv4chandelier.h b/include/rel/d/a/obj/d_a_obj_lv4chandelier/d_a_obj_lv4chandelier.h index d6d0dfb533c..eae512d55f3 100644 --- a/include/rel/d/a/obj/d_a_obj_lv4chandelier/d_a_obj_lv4chandelier.h +++ b/include/rel/d/a/obj/d_a_obj_lv4chandelier/d_a_obj_lv4chandelier.h @@ -1,5 +1,47 @@ #ifndef D_A_OBJ_LV4CHANDELIER_H #define D_A_OBJ_LV4CHANDELIER_H +#include "f_op/f_op_actor_mng.h" +#include "d/d_model.h" + +/** + * @ingroup actors-objects + * @class daObjLv4Chan_c + * @brief Arbiter's Grounds Chandelier + * + * @details + * + */ +class daObjLv4Chan_c : public fopAc_ac_c { +public: + struct ChainPos { + /* 80C66564 */ ~ChainPos(); + /* 80C665A0 */ ChainPos(); + }; + + /* 80C63360 */ void create1st(); + /* 80C634CC */ void setMtxChain(daObjLv4Chan_c::ChainPos*, dMdl_obj_c*, int); + /* 80C636B4 */ void setMtx(); + /* 80C639B4 */ void rideActor(fopAc_ac_c*); + /* 80C63CFC */ void CreateHeap(); + /* 80C63FA8 */ void Create(); + /* 80C6449C */ void constraintChain(daObjLv4Chan_c::ChainPos*, int); + /* 80C64668 */ void constraintBase(); + /* 80C647FC */ void calcVec(daObjLv4Chan_c::ChainPos*, int); + /* 80C64878 */ void chkGnd(); + /* 80C648F4 */ void Execute(f32 (**)[3][4]); + /* 80C65F04 */ void Draw(); + /* 80C66114 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x24a4 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjLv4Chan_c) == 0x24a4); + +class daObjSwChain_c : public fopAc_ac_c { +public: + /* 80C665A4 */ void checkTight(); +}; + #endif /* D_A_OBJ_LV4CHANDELIER_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand.h b/include/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand.h index 0ccc27a0d68..424c52302fd 100644 --- a/include/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand.h +++ b/include/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand.h @@ -1,6 +1,38 @@ #ifndef D_A_OBJ_LV4DIGSAND_H #define D_A_OBJ_LV4DIGSAND_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjL4DigSand_c + * @brief Arbiter's Grounds Digging Sand + * + * @details + * + */ +class daObjL4DigSand_c : public fopAc_ac_c { +public: + /* 80C66B18 */ void initBaseMtx(); + /* 80C66B54 */ void setBaseMtx(); + /* 80C66BC8 */ void Create(); + /* 80C66C24 */ void CreateHeap(); + /* 80C66C94 */ void create1st(); + /* 80C66D40 */ void Execute(f32 (**)[3][4]); + /* 80C66DD0 */ void action(); + /* 80C66E74 */ void mode_init_wait(); + /* 80C66E80 */ void mode_wait(); + /* 80C66EAC */ void mode_init_dig(); + /* 80C66FFC */ void mode_dig(); + /* 80C670AC */ void mode_init_end(); + /* 80C67100 */ void mode_end(); + /* 80C67104 */ void Draw(); + /* 80C671A8 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x944 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjL4DigSand_c) == 0x944); + #endif /* D_A_OBJ_LV4DIGSAND_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor.h b/include/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor.h index dedfcb41c0a..99295ea374a 100644 --- a/include/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor.h +++ b/include/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor.h @@ -4,6 +4,14 @@ #include "d/bg/d_bg_s_movebg_actor.h" #include "f_op/f_op_actor_mng.h" +/** + * @ingroup actors-objects + * @class daObjLv4Floor_c + * @brief Arbiter's Grounds Floor + * + * @details + * + */ class daObjLv4Floor_c : public dBgS_MoveBgActor { public: enum Action_e { @@ -30,10 +38,12 @@ class daObjLv4Floor_c : public dBgS_MoveBgActor { u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8) & 0xFF; } +private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ f32 mMoveYPos; /* 0x5B0 */ u8 mAction; }; +STATIC_ASSERT(sizeof(daObjLv4Floor_c) == 0x5B4); #endif /* D_A_OBJ_LV4FLOOR_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.h b/include/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.h index b5472017daa..4a5e25ae704 100644 --- a/include/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.h +++ b/include/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.h @@ -3,6 +3,14 @@ #include "rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.h" +/** + * @ingroup actors-objects + * @class daObjLv4Gear_c + * @brief Arbiter's Grounds Spinner Gear + * + * @details + * + */ class daObjLv4Gear_c : public fopAc_ac_c { public: enum gear_type_e { @@ -23,6 +31,7 @@ class daObjLv4Gear_c : public fopAc_ac_c { u8 getType() { return fopAcM_GetParamBit(this, 8, 4); } u8 checkSE() { return fopAcM_GetParamBit(this, 12, 4); } +private: /* 0x568 */ request_of_phase_process_class mPhase; /* 0x570 */ J3DModel* mpModel; /* 0x574 */ s16 mTarget; diff --git a/include/rel/d/a/obj/d_a_obj_lv4prelvtr/d_a_obj_lv4prelvtr.h b/include/rel/d/a/obj/d_a_obj_lv4prelvtr/d_a_obj_lv4prelvtr.h index 4a88c0f3b51..c65cd7320bb 100644 --- a/include/rel/d/a/obj/d_a_obj_lv4prelvtr/d_a_obj_lv4prelvtr.h +++ b/include/rel/d/a/obj/d_a_obj_lv4prelvtr/d_a_obj_lv4prelvtr.h @@ -1,6 +1,31 @@ #ifndef D_A_OBJ_LV4PRELVTR_H #define D_A_OBJ_LV4PRELVTR_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjPRElvtr_c + * @brief Arbiter's Grounds Elevator? + * + * @details + * + */ +class daObjPRElvtr_c : public fopAc_ac_c { +public: + /* 80C685F8 */ void create1st(); + /* 80C68688 */ void setMtx(); + /* 80C686F8 */ void CreateHeap(); + /* 80C68768 */ void Create(); + /* 80C68844 */ void Execute(f32 (**)[3][4]); + /* 80C68944 */ void Draw(); + /* 80C689E8 */ void Delete(); + /* 80C68AF0 */ ~daObjPRElvtr_c(); + +private: + /* 0x568 */ u8 field_0x568[0x610 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjPRElvtr_c) == 0x610); + #endif /* D_A_OBJ_LV4PRELVTR_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv4prwall/d_a_obj_lv4prwall.h b/include/rel/d/a/obj/d_a_obj_lv4prwall/d_a_obj_lv4prwall.h index 3f546c5b7d0..6c3ec3503c0 100644 --- a/include/rel/d/a/obj/d_a_obj_lv4prwall/d_a_obj_lv4prwall.h +++ b/include/rel/d/a/obj/d_a_obj_lv4prwall/d_a_obj_lv4prwall.h @@ -1,6 +1,31 @@ #ifndef D_A_OBJ_LV4PRWALL_H #define D_A_OBJ_LV4PRWALL_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjLv4PRwall_c + * @brief Arbiter's Grounds Rail Wall (Not Stallord?) + * + * @details + * + */ +class daObjLv4PRwall_c : public fopAc_ac_c { +public: + /* 80C68C98 */ void create1st(); + /* 80C68DD8 */ void setMtx(); + /* 80C68F20 */ void CreateHeap(); + /* 80C68FA0 */ void Create(); + /* 80C690D8 */ void Execute(f32 (**)[3][4]); + /* 80C696BC */ void Draw(); + /* 80C69760 */ void Delete(); + /* 80C69870 */ ~daObjLv4PRwall_c(); + +private: + /* 0x568 */ u8 field_0x568[0x62c - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjLv4PRwall_c) == 0x62c); + #endif /* D_A_OBJ_LV4PRWALL_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv4sand/d_a_obj_lv4sand.h b/include/rel/d/a/obj/d_a_obj_lv4sand/d_a_obj_lv4sand.h index 675a8a6db12..25122a46c1a 100644 --- a/include/rel/d/a/obj/d_a_obj_lv4sand/d_a_obj_lv4sand.h +++ b/include/rel/d/a/obj/d_a_obj_lv4sand/d_a_obj_lv4sand.h @@ -1,6 +1,40 @@ #ifndef D_A_OBJ_LV4SAND_H #define D_A_OBJ_LV4SAND_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjLv4Sand_c + * @brief Arbiter's Grounds Sand (Stallord Arena) + * + * @details + * + */ +class daObjLv4Sand_c : public fopAc_ac_c { +public: + /* 80C69A98 */ void initBaseMtx(); + /* 80C69AD4 */ void setBaseMtx(); + /* 80C69B50 */ void Create(); + /* 80C69C28 */ void CreateHeap(); + /* 80C69D8C */ void create1st(); + /* 80C69E10 */ void Execute(f32 (**)[3][4]); + /* 80C69F18 */ void action(); + /* 80C69FBC */ void mode_init_wait(); + /* 80C69FC8 */ void mode_wait(); + /* 80C6A01C */ void mode_init_move(); + /* 80C6A034 */ void mode_move(); + /* 80C6A09C */ void mode_init_dead(); + /* 80C6A0A8 */ void mode_dead(); + /* 80C6A0AC */ void eventStart(); + /* 80C6A0D0 */ void Draw(); + /* 80C6A18C */ void Delete(); + /* 80C6A30C */ ~daObjLv4Sand_c(); + +private: + /* 0x568 */ u8 field_0x568[0x5c8 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjLv4Sand_c) == 0x5c8); + #endif /* D_A_OBJ_LV4SAND_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.h b/include/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.h index 9048acff8e9..c5d1563b464 100644 --- a/include/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.h +++ b/include/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.h @@ -1,6 +1,43 @@ #ifndef D_A_OBJ_LV5FLOORBOARD_H #define D_A_OBJ_LV5FLOORBOARD_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daFlorBoad_c + * @brief Snowpeak Ruins Destructable Floor + * + * @details + * + */ +class daFlorBoad_c : public fopAc_ac_c { +public: + /* 80C6A6FC */ void setBaseMtx(); + /* 80C6A784 */ void CreateHeap(); + /* 80C6A7F0 */ void create(); + /* 80C6AAAC */ void Execute(f32 (**)[3][4]); + /* 80C6AB04 */ void procMain(); + /* 80C6AB90 */ void init_modeWait(); + /* 80C6ABAC */ void modeWait(); + /* 80C6AC9C */ void init_modeBreak(); + /* 80C6AD40 */ void modeBreak(); + /* 80C6AEB0 */ void Draw(); + /* 80C6AF54 */ void Delete(); + + static u8 const mCcDObjInfo[48]; + static u8 mCcDCyl[68]; + +private: + /* 0x568 */ u8 field_0x568[0x734 - 0x568]; +}; +STATIC_ASSERT(sizeof(daFlorBoad_c) == 0x734); + +class daFlorBoad_HIO_c { +public: + /* 80C6A60C */ daFlorBoad_HIO_c(); + /* 80C6B058 */ ~daFlorBoad_HIO_c(); +}; + #endif /* D_A_OBJ_LV5FLOORBOARD_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.h b/include/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.h index bff5750c684..2abc33ac5c6 100644 --- a/include/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.h +++ b/include/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.h @@ -1,6 +1,43 @@ #ifndef D_A_OBJ_LV5ICEWALL_H #define D_A_OBJ_LV5ICEWALL_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daIceWall_c + * @brief Snowpeak Ruins Ice Wall + * + * @details + * + */ +class daIceWall_c : public fopAc_ac_c { +public: + /* 80C6B51C */ void setBaseMtx(); + /* 80C6B5E4 */ void CreateHeap(); + /* 80C6B69C */ void create(); + /* 80C6BB60 */ void Execute(f32 (**)[3][4]); + /* 80C6BBC4 */ void procMain(); + /* 80C6BC50 */ void init_modeWait(); + /* 80C6BC6C */ void modeWait(); + /* 80C6C170 */ void init_modeBreak(); + /* 80C6C1C0 */ void modeBreak(); + /* 80C6C374 */ void Draw(); + /* 80C6C44C */ void Delete(); + + static u8 const mCcDObjInfo[48]; + static u8 mCcDCyl[68]; + +private: + /* 0x568 */ u8 field_0x568[0x884 - 0x568]; +}; +STATIC_ASSERT(sizeof(daIceWall_c) == 0x884); + +class daIceWall_HIO_c { +public: + /* 80C6B42C */ daIceWall_HIO_c(); + /* 80C6C550 */ ~daIceWall_HIO_c(); +}; + #endif /* D_A_OBJ_LV5ICEWALL_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.h b/include/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.h index 34927b5fdcf..1dbb1bb130d 100644 --- a/include/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.h +++ b/include/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.h @@ -1,6 +1,43 @@ #ifndef D_A_OBJ_LV5SWICE_H #define D_A_OBJ_LV5SWICE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daLv5SwIce_c + * @brief Snowpeak Ruins Ice Switch + * + * @details + * + */ +class daLv5SwIce_c : public fopAc_ac_c { +public: + /* 80C6CA20 */ void setBaseMtx(); + /* 80C6CAA8 */ void CreateHeap(); + /* 80C6CB14 */ void create(); + /* 80C6CDD0 */ void Execute(f32 (**)[3][4]); + /* 80C6CE28 */ void procMain(); + /* 80C6CEB4 */ void init_modeWait(); + /* 80C6CED0 */ void modeWait(); + /* 80C6D0F4 */ void init_modeBreak(); + /* 80C6D144 */ void modeBreak(); + /* 80C6D260 */ void Draw(); + /* 80C6D314 */ void Delete(); + + static u8 const mCcDObjInfo[48]; + static u8 mCcDCyl[68]; + +private: + /* 0x568 */ u8 field_0x568[0x738 - 0x568]; +}; +STATIC_ASSERT(sizeof(daLv5SwIce_c) == 0x738); + +class daLv5SwIce_HIO_c { +public: + /* 80C6C94C */ daLv5SwIce_HIO_c(); + /* 80C6D418 */ ~daLv5SwIce_HIO_c(); +}; + #endif /* D_A_OBJ_LV5SWICE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.h b/include/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.h index 46f373cae62..d45791294b2 100644 --- a/include/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.h +++ b/include/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.h @@ -1,5 +1,32 @@ #ifndef D_A_OBJ_LV5YCHNDLR_H #define D_A_OBJ_LV5YCHNDLR_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjYchndlr_c + * @brief Snowpeak Ruins Chandelier (Swinging Platform?) + * + * @details + * + */ +class daObjYchndlr_c : public fopAc_ac_c { +public: + /* 80C6D758 */ void create1st(); + /* 80C6D7E0 */ void setMtx(); + /* 80C6D9A8 */ void rideActor(fopAc_ac_c*); + /* 80C6DA5C */ void CreateHeap(); + /* 80C6DB5C */ void Create(); + /* 80C6DC64 */ void Execute(f32 (**)[3][4]); + /* 80C6E300 */ void Draw(); + /* 80C6E3C8 */ void Delete(); + /* 80C6E808 */ ~daObjYchndlr_c(); + +private: + /* 0x568 */ u8 field_0x568[0xca0 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjYchndlr_c) == 0xca0); + #endif /* D_A_OBJ_LV5YCHNDLR_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.h b/include/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.h index 30e0be54de8..8158c1ca4a8 100644 --- a/include/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.h +++ b/include/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.h @@ -1,5 +1,36 @@ #ifndef D_A_OBJ_LV5YIBLLTRAY_H #define D_A_OBJ_LV5YIBLLTRAY_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjYIblltray_c + * @brief Snowpeak Ruins Cannonball Transporter + * + * @details + * + */ +class daObjYIblltray_c : public fopAc_ac_c { +public: + /* 80C6EBF8 */ void create1st(); + /* 80C6EC88 */ void setMtx(); + /* 80C6EDA8 */ void CreateHeap(); + /* 80C6EEFC */ void Create(); + /* 80C6F1E8 */ void rideActor(fopAc_ac_c*); + /* 80C6F23C */ void sendBall(unsigned int); + /* 80C6F440 */ void onAttention(); + /* 80C6F450 */ void offAttention(); + /* 80C6F460 */ void Execute(f32 (**)[3][4]); + /* 80C702E0 */ void initRotTo(); + /* 80C70330 */ void Draw(); + /* 80C70408 */ void Delete(); + /* 80C7088C */ ~daObjYIblltray_c(); + +private: + /* 0x568 */ u8 field_0x568[0xa94 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjYIblltray_c) == 0xa94); + #endif /* D_A_OBJ_LV5YIBLLTRAY_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate.h b/include/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate.h index 49d02de0a1b..89ce09ba5f2 100644 --- a/include/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate.h +++ b/include/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate.h @@ -1,6 +1,50 @@ #ifndef D_A_OBJ_LV6CHANGEGATE_H #define D_A_OBJ_LV6CHANGEGATE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daLv6ChangeGate_c + * @brief Temple of Time Change Block? + * + * @details + * + */ +class daLv6ChangeGate_c : public fopAc_ac_c { +public: + /* 80C70D38 */ void setBaseMtx(); + /* 80C70DD4 */ void CreateHeap(); + /* 80C70E40 */ void create(); + /* 80C712A8 */ void isSwitch(); + /* 80C712F4 */ void Execute(f32 (**)[3][4]); + /* 80C71494 */ void moveGate(); + /* 80C715BC */ void eventStart(); + /* 80C715F4 */ void init_modeWait(); + /* 80C71600 */ void modeWait(); + /* 80C71604 */ void init_modeSlideRight(); + /* 80C716B4 */ void modeSlideRight(); + /* 80C7183C */ void init_modeSlideLeft(); + /* 80C718EC */ void modeSlideLeft(); + /* 80C71A74 */ void init_modeBreak(); + /* 80C71AF8 */ void modeBreak(); + /* 80C71D40 */ void Draw(); + /* 80C71DE4 */ void Delete(); + /* 80C72034 */ ~daLv6ChangeGate_c(); + + static u8 const mCcDObjInfo[48]; + static u8 mCcDCyl[68]; + +private: + /* 0x568 */ u8 field_0x568[0x14dc - 0x568]; +}; +STATIC_ASSERT(sizeof(daLv6ChangeGate_c) == 0x14dc); + +class daLv6ChangeGate_HIO_c { +public: + /* 80C70C4C */ daLv6ChangeGate_HIO_c(); + /* 80C71EE8 */ ~daLv6ChangeGate_HIO_c(); +}; + #endif /* D_A_OBJ_LV6CHANGEGATE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv6FurikoTrap/d_a_obj_lv6FurikoTrap.h b/include/rel/d/a/obj/d_a_obj_lv6FurikoTrap/d_a_obj_lv6FurikoTrap.h index 42a02ce9f3e..a9cd417e809 100644 --- a/include/rel/d/a/obj/d_a_obj_lv6FurikoTrap/d_a_obj_lv6FurikoTrap.h +++ b/include/rel/d/a/obj/d_a_obj_lv6FurikoTrap/d_a_obj_lv6FurikoTrap.h @@ -1,6 +1,41 @@ #ifndef D_A_OBJ_LV6FURIKOTRAP_H #define D_A_OBJ_LV6FURIKOTRAP_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daLv6FurikoTrap_c + * @brief Temple of Time Pendulum Trap + * + * @details + * + */ +class daLv6FurikoTrap_c : public fopAc_ac_c { +public: + /* 80C72510 */ void setBaseMtx(); + /* 80C72598 */ void CreateHeap(); + /* 80C72604 */ void create(); + /* 80C729B4 */ void Execute(f32 (**)[3][4]); + /* 80C72CA8 */ void move(); + /* 80C72D24 */ void init_modeMove(); + /* 80C72D38 */ void modeMove(); + /* 80C72EE0 */ void Draw(); + /* 80C72F94 */ void Delete(); + + static u8 const mCcDObjInfo[48]; + static u8 mCcDSph[64]; + +private: + /* 0x568 */ u8 field_0x568[0x1d18 - 0x568]; +}; +STATIC_ASSERT(sizeof(daLv6FurikoTrap_c) == 0x1d18); + +class daLv6FurikoTrap_HIO_c { +public: + /* 80C7248C */ daLv6FurikoTrap_HIO_c(); + /* 80C73050 */ ~daLv6FurikoTrap_HIO_c(); +}; + #endif /* D_A_OBJ_LV6FURIKOTRAP_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv6Lblock/d_a_obj_lv6Lblock.h b/include/rel/d/a/obj/d_a_obj_lv6Lblock/d_a_obj_lv6Lblock.h index 1d8383008de..e944629cf3b 100644 --- a/include/rel/d/a/obj/d_a_obj_lv6Lblock/d_a_obj_lv6Lblock.h +++ b/include/rel/d/a/obj/d_a_obj_lv6Lblock/d_a_obj_lv6Lblock.h @@ -1,6 +1,43 @@ #ifndef D_A_OBJ_LV6LBLOCK_H #define D_A_OBJ_LV6LBLOCK_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daLv6Lblock_c + * @brief Temple of Time L Block + * + * @details + * + */ +class daLv6Lblock_c : public fopAc_ac_c { +public: + /* 80C73464 */ void setBaseMtx(); + /* 80C734EC */ void CreateHeap(); + /* 80C73558 */ void create(); + /* 80C736C0 */ void isSwitch(); + /* 80C7370C */ void Execute(f32 (**)[3][4]); + /* 80C7375C */ void moveBlock(); + /* 80C73850 */ void init_modeWait(); + /* 80C7385C */ void modeWait(); + /* 80C73860 */ void init_modeLiftUp(); + /* 80C7386C */ void modeLiftUp(); + /* 80C7398C */ void init_modeLiftDown(); + /* 80C73998 */ void modeLiftDown(); + /* 80C73AB0 */ void Draw(); + /* 80C73B54 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x5b8 - 0x568]; +}; +STATIC_ASSERT(sizeof(daLv6Lblock_c) == 0x5b8); + +class daLv6Lblock_HIO_c { +public: + /* 80C733EC */ daLv6Lblock_HIO_c(); + /* 80C73C10 */ ~daLv6Lblock_HIO_c(); +}; + #endif /* D_A_OBJ_LV6LBLOCK_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate.h b/include/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate.h index a9ba555ab96..fcb3f88e080 100644 --- a/include/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate.h +++ b/include/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate.h @@ -1,6 +1,48 @@ #ifndef D_A_OBJ_LV6SWGATE_H #define D_A_OBJ_LV6SWGATE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daLv6SwGate_c + * @brief Temple of Time Switch Gate + * + * @details + * + */ +class daLv6SwGate_c : public fopAc_ac_c { +public: + /* 80C74004 */ void setBaseMtx(); + /* 80C74158 */ void CreateHeap(); + /* 80C7429C */ void create(); + /* 80C74720 */ void isSwitch(); + /* 80C7476C */ void Execute(f32 (**)[3][4]); + /* 80C74A3C */ void moveGate(); + /* 80C74B48 */ void init_modeWait(); + /* 80C74B54 */ void modeWait(); + /* 80C74B58 */ void init_modeOpen(); + /* 80C74B64 */ void modeOpen(); + /* 80C74C7C */ void init_modeClose(); + /* 80C74C94 */ void modeClose(); + /* 80C74DBC */ void init_modeBreak(); + /* 80C74E40 */ void modeBreak(); + /* 80C7524C */ void Draw(); + /* 80C752F8 */ void Delete(); + + static u8 const mCcDObjInfo[48]; + static u8 mCcDCyl[68]; + +private: + /* 0x568 */ u8 field_0x568[0x14f8 - 0x568]; +}; +STATIC_ASSERT(sizeof(daLv6SwGate_c) == 0x14f8); + +class daLv6SwGate_HIO_c { +public: + /* 80C73F0C */ daLv6SwGate_HIO_c(); + /* 80C75434 */ ~daLv6SwGate_HIO_c(); +}; + #endif /* D_A_OBJ_LV6SWGATE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv6SzGate/d_a_obj_lv6SzGate.h b/include/rel/d/a/obj/d_a_obj_lv6SzGate/d_a_obj_lv6SzGate.h index b32bf55b066..5afaf9cc697 100644 --- a/include/rel/d/a/obj/d_a_obj_lv6SzGate/d_a_obj_lv6SzGate.h +++ b/include/rel/d/a/obj/d_a_obj_lv6SzGate/d_a_obj_lv6SzGate.h @@ -1,6 +1,47 @@ #ifndef D_A_OBJ_LV6SZGATE_H #define D_A_OBJ_LV6SZGATE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daLv6SzGate_c + * @brief Temple of Time Stone Statue Gate + * + * @details + * + */ +class daLv6SzGate_c : public fopAc_ac_c { +public: + /* 80C75900 */ void setBaseMtx(); + /* 80C75A54 */ void CreateHeap(); + /* 80C75C0C */ void create(); + /* 80C75E18 */ void Execute(f32 (**)[3][4]); + /* 80C75E78 */ void moveGate(); + /* 80C75F64 */ void init_modeWait(); + /* 80C75F70 */ void modeWait(); + /* 80C75FC0 */ void init_modeOpenWait0(); + /* 80C75FD8 */ void modeOpenWait0(); + /* 80C76010 */ void init_modeOpenWait(); + /* 80C76094 */ void modeOpenWait(); + /* 80C760F0 */ void init_modeOpen(); + /* 80C760FC */ void modeOpen(); + /* 80C7624C */ void modeClose(); + /* 80C76328 */ void init_modeEnd(); + /* 80C76344 */ void modeEnd(); + /* 80C7637C */ void Draw(); + /* 80C76490 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x61c - 0x568]; +}; +STATIC_ASSERT(sizeof(daLv6SzGate_c) == 0x61c); + +class daLv6SzGate_HIO_c { +public: + /* 80C7586C */ daLv6SzGate_HIO_c(); + /* 80C76584 */ ~daLv6SzGate_HIO_c(); +}; + #endif /* D_A_OBJ_LV6SZGATE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv6Tenbin/d_a_obj_lv6Tenbin.h b/include/rel/d/a/obj/d_a_obj_lv6Tenbin/d_a_obj_lv6Tenbin.h index af08e78514a..ab9fd031eb7 100644 --- a/include/rel/d/a/obj/d_a_obj_lv6Tenbin/d_a_obj_lv6Tenbin.h +++ b/include/rel/d/a/obj/d_a_obj_lv6Tenbin/d_a_obj_lv6Tenbin.h @@ -1,6 +1,41 @@ #ifndef D_A_OBJ_LV6TENBIN_H #define D_A_OBJ_LV6TENBIN_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daTenbin_c + * @brief Temple of Time Scale + * + * @details + * + */ +class daTenbin_c : public fopAc_ac_c { +public: + /* 80C769D0 */ void setBaseMtx(); + /* 80C76BCC */ void CreateHeap(); + /* 80C76D10 */ void create(); + /* 80C76EE0 */ void rideCallBackRight(dBgW*, fopAc_ac_c*, fopAc_ac_c*); + /* 80C77078 */ void rideCallBackLeft(dBgW*, fopAc_ac_c*, fopAc_ac_c*); + /* 80C77200 */ void Execute(f32 (**)[3][4]); + /* 80C772BC */ void procMain(); + /* 80C77464 */ void init_modeWait(); + /* 80C77470 */ void modeWait(); + /* 80C77668 */ void balanceCheck(); + /* 80C7772C */ void Draw(); + /* 80C77810 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x654 - 0x568]; +}; +STATIC_ASSERT(sizeof(daTenbin_c) == 0x654); + +class daTenbin_HIO_c { +public: + /* 80C768EC */ daTenbin_HIO_c(); + /* 80C77904 */ ~daTenbin_HIO_c(); +}; + #endif /* D_A_OBJ_LV6TENBIN_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll.h b/include/rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll.h index d97cf137774..e15edab6e7c 100644 --- a/include/rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll.h +++ b/include/rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll.h @@ -1,6 +1,60 @@ #ifndef D_A_OBJ_LV6TOGEROLL_H #define D_A_OBJ_LV6TOGEROLL_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daTogeRoll_c + * @brief Temple of Time Spike Roller + * + * @details + * + */ +class daTogeRoll_c : public fopAc_ac_c { +public: + /* 80C77CC8 */ void setBaseMtx(); + /* 80C77D50 */ void CreateHeap(); + /* 80C77DBC */ void create(); + /* 80C78294 */ void Execute(f32 (**)[3][4]); + /* 80C78638 */ void moveTogeRoll(); + /* 80C78A8C */ void init_modeBound(); + /* 80C78B7C */ void modeBound(); + /* 80C78BD8 */ void modeBound2(); + /* 80C78C34 */ void init_modeBoundWait(); + /* 80C78C50 */ void modeBoundWait(); + /* 80C78CA8 */ void init_modeAcc(); + /* 80C78CB4 */ void modeAcc(); + /* 80C78DA0 */ void init_modeMove(); + /* 80C78DAC */ void modeMove(); + /* 80C790C4 */ void init_modeBrk(); + /* 80C790D0 */ void modeBrk(); + /* 80C792CC */ void init_modeWaitInit(); + /* 80C792E4 */ void modeWaitInit(); + /* 80C79318 */ void init_modeWait(); + /* 80C79324 */ void modeWait(); + /* 80C79344 */ void init_modeBreak(); + /* 80C793C8 */ void modeBreak(); + /* 80C795E8 */ void setNextPoint(); + /* 80C79714 */ void Draw(); + /* 80C797B8 */ void Delete(); + + static u8 const mCcDObjInfo[48]; + static u8 const mCcDObjInfo2[48]; + static u8 const mSpeed[64]; + static u8 mCcDSph[64]; + static u8 mCcDCps[76]; + +private: + /* 0x568 */ u8 field_0x568[0x117c - 0x568]; +}; +STATIC_ASSERT(sizeof(daTogeRoll_c) == 0x117c); + +class daTogeRoll_HIO_c { +public: + /* 80C77C2C */ daTogeRoll_HIO_c(); + /* 80C798D0 */ ~daTogeRoll_HIO_c(); +}; + #endif /* D_A_OBJ_LV6TOGEROLL_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap.h b/include/rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap.h index b8f78f39eef..0627093e35d 100644 --- a/include/rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap.h +++ b/include/rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap.h @@ -1,6 +1,73 @@ #ifndef D_A_OBJ_LV6TOGETRAP_H #define D_A_OBJ_LV6TOGETRAP_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daLv6TogeTrap_c + * @brief Temple of Time Spiked Trap + * + * @details + * + */ +class daLv6TogeTrap_c : public fopAc_ac_c { +public: + /* 80C79F10 */ void setBaseMtx(); + /* 80C79FE8 */ void CreateHeap(); + /* 80C7A068 */ void create(); + /* 80C7A6B0 */ void searchSekizoAct(void*, void*); + /* 80C7A700 */ void Execute(f32 (**)[3][4]); + /* 80C7A97C */ void moveLift(); + /* 80C7ABC8 */ void executeType1(); + /* 80C7ACA0 */ void init_modeBound(); + /* 80C7AD40 */ void modeBound(); + /* 80C7ADA4 */ void init_modeBoundWait(); + /* 80C7ADC0 */ void modeBoundWait(); + /* 80C7AE18 */ void init_modeAcc(); + /* 80C7AE24 */ void modeAcc(); + /* 80C7AF10 */ void init_modeMove(); + /* 80C7AF1C */ void modeMove(); + /* 80C7B234 */ void init_modeBrk(); + /* 80C7B240 */ void modeBrk(); + /* 80C7B43C */ void init_modeMove2(); + /* 80C7B448 */ void modeMove2(); + /* 80C7B518 */ void init_modeWaitInit(); + /* 80C7B530 */ void modeWaitInit(); + /* 80C7B600 */ void init_modeWait(); + /* 80C7B60C */ void modeWait(); + /* 80C7B6D4 */ void executeType2(); + /* 80C7B988 */ void init_modeWaitType2(); + /* 80C7B9A8 */ void modeWaitType2(); + /* 80C7BA38 */ void init_modeMoveInitType2(); + /* 80C7BA50 */ void modeMoveInitType2(); + /* 80C7BAE8 */ void init_modeAccType2(); + /* 80C7BAF4 */ void modeAccType2(); + /* 80C7BC54 */ void init_modeWaitAttackType2(); + /* 80C7BC7C */ void modeWaitAttackType2(); + /* 80C7BD64 */ void init_modeRotate(); + /* 80C7BD70 */ void modeRotate(); + /* 80C7BED8 */ void init_modeBreak(); + /* 80C7BFE4 */ void modeBreak(); + /* 80C7C1D8 */ void setNextPoint(); + /* 80C7C33C */ void Draw(); + /* 80C7C3E0 */ void Delete(); + + static u8 const mCcDObjInfo[48]; + static u8 const mCcDObjInfo2[48]; + static u8 const mSpeed[64]; + static u8 mCcDSph[64]; + static u8 mCcDCyl[68]; + +private: + /* 0x568 */ u8 field_0x568[0x8f4 - 0x568]; +}; +STATIC_ASSERT(sizeof(daLv6TogeTrap_c) == 0x8f4); + +class daLv6TogeTrap_HIO_c { +public: + /* 80C79E4C */ daLv6TogeTrap_HIO_c(); + /* 80C7C504 */ ~daLv6TogeTrap_HIO_c(); +}; #endif /* D_A_OBJ_LV6TOGETRAP_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.h b/include/rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.h index 8b6b07231da..0746e632717 100644 --- a/include/rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.h +++ b/include/rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.h @@ -1,5 +1,35 @@ #ifndef D_A_OBJ_LV6BEMOS_H #define D_A_OBJ_LV6BEMOS_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjL6Bm_c + * @brief Temple of Time Beamos (Unused) + * + * @details + * + */ +class daObjL6Bm_c : public fopAc_ac_c { +public: + /* 80C7CE24 */ void initBaseMtx(); + /* 80C7CE60 */ void setBaseMtx(); + /* 80C7CED4 */ void Create(); + /* 80C7CFD0 */ void CreateHeap(); + /* 80C7D2F8 */ void create1st(); + /* 80C7D3A4 */ void Execute(f32 (**)[3][4]); + /* 80C7D4F4 */ void action(); + /* 80C7D598 */ void actionWait(); + /* 80C7D6CC */ void actionFindPlayer(); + /* 80C7D894 */ void actionAttack(); + /* 80C7D898 */ void Draw(); + /* 80C7DABC */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x918 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjL6Bm_c) == 0x918); + #endif /* D_A_OBJ_LV6BEMOS_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.h b/include/rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.h index 727d1b7b2a8..05950d4fac6 100644 --- a/include/rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.h +++ b/include/rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.h @@ -1,5 +1,53 @@ #ifndef D_A_OBJ_LV6BEMOS2_H #define D_A_OBJ_LV6BEMOS2_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjLv6Bm_c + * @brief Temple of Time Beamos + * + * @details + * + */ +class daObjLv6Bm_c : public fopAc_ac_c { +public: + /* 80C7E30C */ void initBaseMtx(); + /* 80C7E374 */ void setBaseMtx(); + /* 80C7E448 */ void Create(); + /* 80C7E764 */ void CreateHeap(); + /* 80C7EB7C */ void create1st(); + /* 80C7EC6C */ void Execute(f32 (**)[3][4]); + /* 80C7EE50 */ void action(); + /* 80C7F2A4 */ void calcBeam(); + /* 80C7F904 */ void checkFindPlayer(); + /* 80C7FA54 */ void checkSearchPlayer(); + /* 80C7FBA4 */ void getSearchDistance(); + /* 80C7FBFC */ void getBeamSearchDistance(); + /* 80C7FC54 */ void effect_proc(); + /* 80C7FD8C */ void effectWait(); + /* 80C7FD90 */ void initEffectSet0(); + /* 80C7FEC4 */ void effectSet0(); + /* 80C7FF78 */ void initActionSwWait(); + /* 80C7FFB8 */ void actionSwWait(); + /* 80C802AC */ void initActionWarning(); + /* 80C802C0 */ void actionWarning(); + /* 80C803D8 */ void initActionFindPlayer(); + /* 80C80538 */ void actionFindPlayer(); + /* 80C80684 */ void initActionAttack(); + /* 80C8082C */ void actionAttack(); + /* 80C80F48 */ void initActionDead(); + /* 80C81154 */ void actionDead(); + /* 80C81428 */ void initActionEnd(); + /* 80C814FC */ void actionEnd(); + /* 80C81500 */ void Draw(); + /* 80C816A8 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0xabc - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjLv6Bm_c) == 0xabc); + #endif /* D_A_OBJ_LV6BEMOS2_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv6egate/d_a_obj_lv6egate.h b/include/rel/d/a/obj/d_a_obj_lv6egate/d_a_obj_lv6egate.h index 52061bb7d8e..1d932226b61 100644 --- a/include/rel/d/a/obj/d_a_obj_lv6egate/d_a_obj_lv6egate.h +++ b/include/rel/d/a/obj/d_a_obj_lv6egate/d_a_obj_lv6egate.h @@ -1,5 +1,33 @@ #ifndef D_A_OBJ_LV6EGATE_H #define D_A_OBJ_LV6EGATE_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjLv6EGate_c + * @brief Temple of Time Electric Gate + * + * @details + * + */ +class daObjLv6EGate_c : public fopAc_ac_c { +public: + /* 80C82078 */ void create1st(); + /* 80C82108 */ void setMtx(); + /* 80C82178 */ bool CreateHeap(); + /* 80C82180 */ void Create(); + /* 80C822DC */ void offDisp(); + /* 80C82330 */ void onDisp(); + /* 80C82388 */ void Execute(f32 (**)[3][4]); + /* 80C82690 */ void Draw(); + /* 80C826A0 */ void Delete(); + /* 80C82A80 */ ~daObjLv6EGate_c(); + +private: + /* 0x568 */ u8 field_0x568[0x1038 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjLv6EGate_c) == 0x1038); + #endif /* D_A_OBJ_LV6EGATE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv6elevta/d_a_obj_lv6elevta.h b/include/rel/d/a/obj/d_a_obj_lv6elevta/d_a_obj_lv6elevta.h index 82d71b4f35d..155b5356859 100644 --- a/include/rel/d/a/obj/d_a_obj_lv6elevta/d_a_obj_lv6elevta.h +++ b/include/rel/d/a/obj/d_a_obj_lv6elevta/d_a_obj_lv6elevta.h @@ -1,6 +1,33 @@ #ifndef D_A_OBJ_LV6ELEVTA_H #define D_A_OBJ_LV6ELEVTA_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjLv6ElevtA_c + * @brief Temple of Time Elevator + * + * @details + * + */ +class daObjLv6ElevtA_c : public fopAc_ac_c { +public: + /* 80C82D38 */ void create1st(); + /* 80C82DC8 */ void setMtx(); + /* 80C82E38 */ void CreateHeap(); + /* 80C82EA8 */ void Create(); + /* 80C83028 */ void eventStart(); + /* 80C830BC */ void moveAngle(void*); + /* 80C8321C */ void Execute(f32 (**)[3][4]); + /* 80C83538 */ void Draw(); + /* 80C835DC */ void Delete(); + /* 80C83764 */ ~daObjLv6ElevtA_c(); + +private: + /* 0x568 */ u8 field_0x568[0x628 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjLv6ElevtA_c) == 0x628); + #endif /* D_A_OBJ_LV6ELEVTA_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv6swturn/d_a_obj_lv6swturn.h b/include/rel/d/a/obj/d_a_obj_lv6swturn/d_a_obj_lv6swturn.h index f2799b0a4bf..555c68fb68b 100644 --- a/include/rel/d/a/obj/d_a_obj_lv6swturn/d_a_obj_lv6swturn.h +++ b/include/rel/d/a/obj/d_a_obj_lv6swturn/d_a_obj_lv6swturn.h @@ -1,6 +1,36 @@ #ifndef D_A_OBJ_LV6SWTURN_H #define D_A_OBJ_LV6SWTURN_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjLv6SwTurn_c + * @brief Temple of Time Turn Switch + * + * @details + * + */ +class daObjLv6SwTurn_c : public fopAc_ac_c { +public: + /* 80C83A98 */ void initBaseMtx(); + /* 80C83AD4 */ void setBaseMtx(); + /* 80C83B38 */ void Create(); + /* 80C83C10 */ void CreateHeap(); + /* 80C83C80 */ void create1st(); + /* 80C83D04 */ void Execute(f32 (**)[3][4]); + /* 80C83D94 */ void mode_proc_call(); + /* 80C83E20 */ void init_modeWait(); + /* 80C83E58 */ void modeWait(); + /* 80C84238 */ void init_modeRotate(); + /* 80C8425C */ void modeRotate(); + /* 80C844F8 */ void Draw(); + /* 80C8459C */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x5cc - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjLv6SwTurn_c) == 0x5cc); + #endif /* D_A_OBJ_LV6SWTURN_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv7BsGate/d_a_obj_lv7BsGate.h b/include/rel/d/a/obj/d_a_obj_lv7BsGate/d_a_obj_lv7BsGate.h index ca7705bf5cf..8972b531ba4 100644 --- a/include/rel/d/a/obj/d_a_obj_lv7BsGate/d_a_obj_lv7BsGate.h +++ b/include/rel/d/a/obj/d_a_obj_lv7BsGate/d_a_obj_lv7BsGate.h @@ -1,6 +1,42 @@ #ifndef D_A_OBJ_LV7BSGATE_H #define D_A_OBJ_LV7BSGATE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daLv7BsGate_c + * @brief City in the Sky Boss Door + * + * @details + * + */ +class daLv7BsGate_c : public fopAc_ac_c { +public: + /* 80C84930 */ void setBaseMtx(); + /* 80C849CC */ void CreateHeap(); + /* 80C84A4C */ void create(); + /* 80C84BCC */ void Execute(f32 (**)[3][4]); + /* 80C84C1C */ void moveGate(); + /* 80C84D24 */ void init_modeWait(); + /* 80C84D30 */ void modeWait(); + /* 80C84D34 */ void init_modeOpen(); + /* 80C84D40 */ void modeOpen(); + /* 80C84E94 */ void init_modeClose(); + /* 80C84EA0 */ void modeClose(); + /* 80C84FF4 */ void Draw(); + /* 80C85098 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x5bc - 0x568]; +}; +STATIC_ASSERT(sizeof(daLv7BsGate_c) == 0x5bc); + +class daLv7BsGate_HIO_c { +public: + /* 80C848AC */ daLv7BsGate_HIO_c(); + /* 80C85164 */ ~daLv7BsGate_HIO_c(); +}; + #endif /* D_A_OBJ_LV7BSGATE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv7PropellerY/d_a_obj_lv7PropellerY.h b/include/rel/d/a/obj/d_a_obj_lv7PropellerY/d_a_obj_lv7PropellerY.h index bd3fff464a3..01d99a33906 100644 --- a/include/rel/d/a/obj/d_a_obj_lv7PropellerY/d_a_obj_lv7PropellerY.h +++ b/include/rel/d/a/obj/d_a_obj_lv7PropellerY/d_a_obj_lv7PropellerY.h @@ -1,6 +1,46 @@ #ifndef D_A_OBJ_LV7PROPELLERY_H #define D_A_OBJ_LV7PROPELLERY_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daPropY_c + * @brief City in the Sky Propeller + * + * @details + * + */ +class daPropY_c : public fopAc_ac_c { +public: + /* 80C8550C */ void setBaseMtx(); + /* 80C855A4 */ void CreateHeap(); + /* 80C85624 */ void create(); + /* 80C85810 */ void Execute(f32 (**)[3][4]); + /* 80C85860 */ void procMain(); + /* 80C859B4 */ void init_modeMoveWait(); + /* 80C859C0 */ void modeMoveWait(); + /* 80C859C4 */ void init_modeMove(); + /* 80C859E0 */ void modeMove(); + /* 80C85B08 */ void init_modeWait(); + /* 80C85B24 */ void modeWait(); + /* 80C85B5C */ void init_modeMove2(); + /* 80C85B84 */ void modeMove2(); + /* 80C85CAC */ void init_modeStop(); + /* 80C85DD0 */ void modeStop(); + /* 80C85F14 */ void Draw(); + /* 80C85FB8 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x5c8 - 0x568]; +}; +STATIC_ASSERT(sizeof(daPropY_c) == 0x5c8); + +class daPropY_HIO_c { +public: + /* 80C8546C */ daPropY_HIO_c(); + /* 80C86084 */ ~daPropY_HIO_c(); +}; + #endif /* D_A_OBJ_LV7PROPELLERY_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge.h b/include/rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge.h index 47123b6ad3e..1731b4becd8 100644 --- a/include/rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge.h +++ b/include/rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge.h @@ -1,5 +1,36 @@ #ifndef D_A_OBJ_LV7BRIDGE_H #define D_A_OBJ_LV7BRIDGE_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjLv7Brg_c + * @brief City in the Sky Bridge + * + * @details + * + */ +class daObjLv7Brg_c : public fopAc_ac_c { +public: + /* 80C863EC */ void search_swspinner(); + /* 80C86454 */ void initBaseMtx(); + /* 80C864B4 */ void setBaseMtx(); + /* 80C865B8 */ void Create(); + /* 80C867CC */ void CreateHeap(); + /* 80C86A44 */ void create1st(); + /* 80C86B40 */ void Execute(f32 (**)[3][4]); + /* 80C86E68 */ void action(); + /* 80C86F44 */ void mode_action(); + /* 80C87210 */ void mode_end(); + /* 80C87214 */ void calcCoPos(); + /* 80C87304 */ void Draw(); + /* 80C87458 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0xaa4 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjLv7Brg_c) == 0xaa4); + #endif /* D_A_OBJ_LV7BRIDGE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/d_a_obj_lv8KekkaiTrap.h b/include/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/d_a_obj_lv8KekkaiTrap.h index ae6fbf0fb65..46492a4462c 100644 --- a/include/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/d_a_obj_lv8KekkaiTrap.h +++ b/include/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/d_a_obj_lv8KekkaiTrap.h @@ -1,6 +1,42 @@ #ifndef D_A_OBJ_LV8KEKKAITRAP_H #define D_A_OBJ_LV8KEKKAITRAP_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daKekaiTrap_c + * @brief Palace of Twilight Barrier Trap + * + * @details + * + */ +class daKekaiTrap_c : public fopAc_ac_c { +public: + /* 80C87D40 */ void setBaseMtx(); + /* 80C87DC8 */ void CreateHeap(); + /* 80C87E48 */ void create(); + /* 80C87FB0 */ void Execute(f32 (**)[3][4]); + /* 80C88000 */ void moveMain(); + /* 80C88104 */ void init_modeWait(); + /* 80C88110 */ void modeWait(); + /* 80C88114 */ void init_modeMoveUp(); + /* 80C88138 */ void modeMoveUp(); + /* 80C881F0 */ void init_modeMoveDown(); + /* 80C88214 */ void modeMoveDown(); + /* 80C882C8 */ void Draw(); + /* 80C8836C */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x5b4 - 0x568]; +}; +STATIC_ASSERT(sizeof(daKekaiTrap_c) == 0x5b4); + +class daKekaiTrap_HIO_c { +public: + /* 80C87CAC */ daKekaiTrap_HIO_c(); + /* 80C88438 */ ~daKekaiTrap_HIO_c(); +}; + #endif /* D_A_OBJ_LV8KEKKAITRAP_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift.h b/include/rel/d/a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift.h index 787edfd2976..920360e9233 100644 --- a/include/rel/d/a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift.h +++ b/include/rel/d/a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift.h @@ -1,6 +1,61 @@ #ifndef D_A_OBJ_LV8LIFT_H #define D_A_OBJ_LV8LIFT_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daL8Lift_c + * @brief Palace of Twilight Platform Lift + * + * @details + * + */ +class daL8Lift_c : public fopAc_ac_c { +public: + /* 80C887D8 */ void setBaseMtx(); + /* 80C88860 */ void CreateHeap(); + /* 80C88928 */ void create(); + /* 80C88D6C */ void lightSet(); + /* 80C88DBC */ void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*); + /* 80C88DD4 */ void Execute(f32 (**)[3][4]); + /* 80C88E34 */ void moveLift(); + /* 80C890B8 */ void modeAcc(); + /* 80C89198 */ void init_modeMove(); + /* 80C891A4 */ void modeMove(); + /* 80C894BC */ void init_modeBrk(); + /* 80C894C8 */ void modeBrk(); + /* 80C896C8 */ void init_modeWaitInit(); + /* 80C896D4 */ void modeWaitInit(); + /* 80C89708 */ void init_modeWait(); + /* 80C89714 */ void modeWait(); + /* 80C89720 */ void init_modeMoveWait(); + /* 80C8972C */ void modeMoveWait(); + /* 80C89770 */ void init_modeOnAnm(); + /* 80C89820 */ void modeOnAnm(); + /* 80C89874 */ void init_modeStop(); + /* 80C898DC */ void modeStop(); + /* 80C899D0 */ void init_modeInitSet(); + /* 80C89A04 */ void modeInitSet(); + /* 80C89A24 */ void init_modeInitSet2(); + /* 80C89A58 */ void modeInitSet2(); + /* 80C89A78 */ void liftReset(); + /* 80C89ADC */ void setNextPoint(); + /* 80C89C10 */ void Draw(); + /* 80C89DC8 */ void Delete(); + + static u8 const mSpeed[64]; + +private: + /* 0x568 */ u8 field_0x568[0x830 - 0x568]; +}; +STATIC_ASSERT(sizeof(daL8Lift_c) == 0x830); + +class daL8Lift_HIO_c { +public: + /* 80C8872C */ daL8Lift_HIO_c(); + /* 80C89EA4 */ ~daL8Lift_HIO_c(); +}; + #endif /* D_A_OBJ_LV8LIFT_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv8OptiLift/d_a_obj_lv8OptiLift.h b/include/rel/d/a/obj/d_a_obj_lv8OptiLift/d_a_obj_lv8OptiLift.h index 733cdbccfa9..fdf1efda91a 100644 --- a/include/rel/d/a/obj/d_a_obj_lv8OptiLift/d_a_obj_lv8OptiLift.h +++ b/include/rel/d/a/obj/d_a_obj_lv8OptiLift/d_a_obj_lv8OptiLift.h @@ -1,6 +1,60 @@ #ifndef D_A_OBJ_LV8OPTILIFT_H #define D_A_OBJ_LV8OPTILIFT_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daOptiLift_c + * @brief Palace of Twilight Optilift + * + * @details + * + */ +class daOptiLift_c : public fopAc_ac_c { +public: + /* 80C8A3B0 */ void setBaseMtx(); + /* 80C8A438 */ void CreateHeap(); + /* 80C8A500 */ void create(); + /* 80C8A780 */ void lightSet(); + /* 80C8A7D0 */ void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*); + /* 80C8A7E8 */ void Execute(f32 (**)[3][4]); + /* 80C8A848 */ void moveLift(); + /* 80C8AAC4 */ void init_modeAcc(); + /* 80C8AAD0 */ void modeAcc(); + /* 80C8ABB0 */ void init_modeMove(); + /* 80C8ABBC */ void modeMove(); + /* 80C8AED4 */ void init_modeBrk(); + /* 80C8AEE0 */ void modeBrk(); + /* 80C8B100 */ void init_modeMoveInit(); + /* 80C8B1B0 */ void modeMoveInit(); + /* 80C8B1F0 */ void init_modeMoveWait(); + /* 80C8B230 */ void modeMoveWait(); + /* 80C8B288 */ void init_modeWait(); + /* 80C8B294 */ void modeWait(); + /* 80C8B298 */ void init_modeStop(); + /* 80C8B318 */ void modeStop(); + /* 80C8B428 */ void init_modeInitSet(); + /* 80C8B464 */ void modeInitSet(); + /* 80C8B484 */ void init_modeInitSet2(); + /* 80C8B4B8 */ void modeInitSet2(); + /* 80C8B4D8 */ void liftReset(); + /* 80C8B53C */ void setNextPoint(); + /* 80C8B66C */ void Draw(); + /* 80C8B824 */ void Delete(); + + static u8 const mSpeed[64]; + +private: + /* 0x568 */ u8 field_0x568[0x618 - 0x568]; +}; +STATIC_ASSERT(sizeof(daOptiLift_c) == 0x618); + +class daOptiLift_HIO_c { +public: + /* 80C8A30C */ daOptiLift_HIO_c(); + /* 80C8B900 */ ~daOptiLift_HIO_c(); +}; + #endif /* D_A_OBJ_LV8OPTILIFT_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv8UdFloor/d_a_obj_lv8UdFloor.h b/include/rel/d/a/obj/d_a_obj_lv8UdFloor/d_a_obj_lv8UdFloor.h index 8d3435b9f1f..70ca056d31e 100644 --- a/include/rel/d/a/obj/d_a_obj_lv8UdFloor/d_a_obj_lv8UdFloor.h +++ b/include/rel/d/a/obj/d_a_obj_lv8UdFloor/d_a_obj_lv8UdFloor.h @@ -1,6 +1,47 @@ #ifndef D_A_OBJ_LV8UDFLOOR_H #define D_A_OBJ_LV8UDFLOOR_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daUdFloor_c + * @brief Palace of Twilight Switch Step + * + * @details + * + */ +class daUdFloor_c : public fopAc_ac_c { +public: + /* 80C8BDC8 */ void setBaseMtx(); + /* 80C8BE64 */ void CreateHeap(); + /* 80C8BEE4 */ void create(); + /* 80C8C0DC */ void Execute(f32 (**)[3][4]); + /* 80C8C12C */ void moveLift(); + /* 80C8C264 */ void init_modeWait(); + /* 80C8C270 */ void modeWait(); + /* 80C8C274 */ void init_modeUpMoveInit(); + /* 80C8C310 */ void modeUpMoveInit(); + /* 80C8C354 */ void colorAnm(int); + /* 80C8C5E4 */ void init_modeUpMove(); + /* 80C8C68C */ void modeUpMove(); + /* 80C8C7F8 */ void init_modeDownMoveInit(); + /* 80C8C81C */ void modeDownMoveInit(); + /* 80C8C860 */ void init_modeDownMove(); + /* 80C8C8E4 */ void modeDownMove(); + /* 80C8C994 */ void Draw(); + /* 80C8CA78 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x5c8 - 0x568]; +}; +STATIC_ASSERT(sizeof(daUdFloor_c) == 0x5c8); + +class daUdFloor_HIO_c { +public: + /* 80C8BD0C */ daUdFloor_HIO_c(); + /* 80C8CB44 */ ~daUdFloor_HIO_c(); +}; + #endif /* D_A_OBJ_LV8UDFLOOR_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv9SwShutter/d_a_obj_lv9SwShutter.h b/include/rel/d/a/obj/d_a_obj_lv9SwShutter/d_a_obj_lv9SwShutter.h index 6b26c5bf59f..27d02b67d5e 100644 --- a/include/rel/d/a/obj/d_a_obj_lv9SwShutter/d_a_obj_lv9SwShutter.h +++ b/include/rel/d/a/obj/d_a_obj_lv9SwShutter/d_a_obj_lv9SwShutter.h @@ -1,6 +1,42 @@ #ifndef D_A_OBJ_LV9SWSHUTTER_H #define D_A_OBJ_LV9SWSHUTTER_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daLv9SwShutter_c + * @brief Hyrule Castle Switch Shutter + * + * @details + * + */ +class daLv9SwShutter_c : public fopAc_ac_c { +public: + /* 80C8CF38 */ void setBaseMtx(); + /* 80C8CFD4 */ void CreateHeap(); + /* 80C8D040 */ void create(); + /* 80C8D168 */ void Execute(f32 (**)[3][4]); + /* 80C8D1B8 */ void moveShutter(); + /* 80C8D2BC */ void init_modeWait(); + /* 80C8D2C8 */ void modeWait(); + /* 80C8D2CC */ void init_modeOpen(); + /* 80C8D2D8 */ void modeOpen(); + /* 80C8D440 */ void init_modeClose(); + /* 80C8D458 */ void modeClose(); + /* 80C8D5D0 */ void Draw(); + /* 80C8D674 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x5b4 - 0x568]; +}; +STATIC_ASSERT(sizeof(daLv9SwShutter_c) == 0x5b4); + +class daLv9SwShutter_HIO_c { +public: + /* 80C8CEAC */ daLv9SwShutter_HIO_c(); + /* 80C8D730 */ ~daLv9SwShutter_HIO_c(); +}; + #endif /* D_A_OBJ_LV9SWSHUTTER_H */ diff --git a/include/rel/d/a/obj/d_a_obj_magLift/d_a_obj_magLift.h b/include/rel/d/a/obj/d_a_obj_magLift/d_a_obj_magLift.h index 6688216b744..5a277442763 100644 --- a/include/rel/d/a/obj/d_a_obj_magLift/d_a_obj_magLift.h +++ b/include/rel/d/a/obj/d_a_obj_magLift/d_a_obj_magLift.h @@ -1,6 +1,51 @@ #ifndef D_A_OBJ_MAGLIFT_H #define D_A_OBJ_MAGLIFT_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daMagLift_c + * @brief Magnetic Lift + * + * @details + * + */ +class daMagLift_c : public fopAc_ac_c { +public: + /* 80C8DAA0 */ void setBaseMtx(); + /* 80C8DB28 */ void CreateHeap(); + /* 80C8DB94 */ void create(); + /* 80C8DD38 */ void Execute(f32 (**)[3][4]); + /* 80C8DD88 */ void moveLift(); + /* 80C8DE98 */ void modeAcc(); + /* 80C8DF20 */ void init_modeMove(); + /* 80C8DF2C */ void modeMove(); + /* 80C8E1EC */ void init_modeBrk(); + /* 80C8E1F8 */ void modeBrk(); + /* 80C8E260 */ void init_modeWaitInit(); + /* 80C8E26C */ void modeWaitInit(); + /* 80C8E2A0 */ void init_modeWait(); + /* 80C8E2AC */ void modeWait(); + /* 80C8E2B8 */ void init_modeMoveWait(); + /* 80C8E2C4 */ void modeMoveWait(); + /* 80C8E318 */ void modeDead(); + /* 80C8E31C */ void setNextPoint(); + /* 80C8E450 */ void Draw(); + /* 80C8E4F4 */ void Delete(); + + static u8 const mSpeed[64]; + +private: + /* 0x568 */ u8 field_0x568[0x5d4 - 0x568]; +}; +STATIC_ASSERT(sizeof(daMagLift_c) == 0x5d4); + +class daMagLift_HIO_c { +public: + /* 80C8DA2C */ daMagLift_HIO_c(); + /* 80C8E5B0 */ ~daMagLift_HIO_c(); +}; + #endif /* D_A_OBJ_MAGLIFT_H */ diff --git a/include/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.h b/include/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.h index 9b57eb4a8ed..760c541b5b1 100644 --- a/include/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.h +++ b/include/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.h @@ -2,5 +2,85 @@ #define D_A_OBJ_MAGLIFTROT_H #include "d/bg/d_bg_s_movebg_actor.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daMagLiftRot_c + * @brief Rotating Magnetic Lift + * + * @details + * + */ +class daMagLiftRot_c : public dBgS_MoveBgActor { +public: + /* 80C8EA28 */ void setBaseMtx(); + /* 80C8EC64 */ int create(); + /* 80C8F02C */ void moveLift(); + /* 80C8F264 */ void init_modeMove(); + /* 80C8F4A0 */ void modeMove(); + /* 80C8F538 */ void init_modeWait(); + /* 80C8F7CC */ void modeWait(); + /* 80C8F804 */ void init_modeMoveWait(); + /* 80C8F810 */ void modeMoveWait(); + + /* 80C8EB1C */ virtual int CreateHeap(); + /* 80C8EF94 */ virtual int Execute(Mtx**); + /* 80C8F86C */ virtual int Draw(); + /* 80C8F970 */ virtual int Delete(); + +private: + /* 0x5A0 */ request_of_phase_process_class mPhase; + /* 0x5A8 */ J3DModel* mpModel; + /* 0x5AC */ mDoExt_btkAnm mBtk; + /* 0x5C4 */ mDoExt_brkAnm mBrk; + /* 0x5DC */ u8 mType; + /* 0x5DE */ s16 mTimer; + /* 0x5E0 */ u8 mMode; + /* 0x5E1 */ u8 field_0x5e1; + /* 0x5E2 */ s16 field_0x5e2; + /* 0x5E4 */ s16 field_0x5e4; + /* 0x5E6 */ csXyz field_0x5e6; + /* 0x5EC */ cXyz field_0x5ec; + /* 0x5F8 */ f32 field_0x5f8; + /* 0x5FC */ f32 mShakeStrength; + /* 0x600 */ f32 field_0x600; + /* 0x604 */ f32 mShakeYAmp; + /* 0x608 */ f32 mShakeDecay; + /* 0x60C */ f32 mMaxShakeDecay; + /* 0x610 */ f32 mMinShakeDecay; + /* 0x614 */ f32 mMoveStrength; + /* 0x618 */ f32 mXMoveAmp; + /* 0x61C */ f32 mZMoveAmp; + /* 0x620 */ f32 mMoveDecay; + /* 0x624 */ f32 mMaxMoveDecay; + /* 0x628 */ f32 mMinMoveDecay; + /* 0x62C */ f32 field_0x62c; + /* 0x630 */ f32 field_0x630; +}; +STATIC_ASSERT(sizeof(daMagLiftRot_c) == 0x634); + +class daMagLiftRot_HIO_c : public mDoHIO_entry_c { +public: + /* 80C8E94C */ daMagLiftRot_HIO_c(); + /* 80C8FA3C */ virtual ~daMagLiftRot_HIO_c(); + + /* 0x04 */ u8 mWaitTime; + /* 0x08 */ f32 mInitSpeed; + /* 0x0C */ f32 mAcceleration; + /* 0x10 */ f32 mMaxSpeed; + /* 0x14 */ f32 mShakeStrength; + /* 0x18 */ f32 mShakeAmpY; + /* 0x1C */ f32 mShakeDecay; + /* 0x20 */ f32 mMaxShakeDecay; + /* 0x24 */ f32 mMinShakeDecay; + /* 0x28 */ f32 mMoveAmpX; + /* 0x2C */ f32 mMoveAmpZ; + /* 0x30 */ f32 mMoveStrength; + /* 0x34 */ f32 mMoveDecay; + /* 0x38 */ f32 mMaxMoveDecay; + /* 0x3C */ f32 mMinMoveDecay; +}; + #endif /* D_A_OBJ_MAGLIFTROT_H */ diff --git a/include/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm.h b/include/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm.h index 8ca45aa786c..d0af78a0633 100644 --- a/include/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm.h +++ b/include/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm.h @@ -1,6 +1,91 @@ #ifndef D_A_OBJ_MAGNE_ARM_H #define D_A_OBJ_MAGNE_ARM_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjMarm_c + * @brief Magnetic Arm + * + * @details + * + */ +class daObjMarm_c : public fopAc_ac_c { +public: + /* 8058F358 */ void getBpartsOffset(cXyz*); + /* 8058F3D4 */ void getDpartsOffset(cXyz*); + /* 8058F46C */ void getEpartsOffset(cXyz*); + /* 8058F504 */ void getFpartsOffset(cXyz*); + /* 8058F610 */ void getRopeStartPos(cXyz*); + /* 8058F6B4 */ void initBaseMtx(); + /* 8058F77C */ void setBaseMtx(); + /* 8058FA50 */ void Create(); + /* 8058FCF8 */ void CreateHeap(); + /* 80590244 */ void phase_0(); + /* 805902D8 */ void phase_1(); + /* 80590364 */ void phase_2(); + /* 80590460 */ void create1st(); + /* 80590504 */ void Execute(f32 (**)[3][4]); + /* 80590818 */ void action(); + /* 80590B7C */ void init_typeA_modeWait(); + /* 80590B8C */ void typeA_modeWait(); + /* 80590BE0 */ void init_typeA_modeMholeOn(); + /* 80590C48 */ void typeA_modeMholeOn(); + /* 80590C68 */ void typeA_modeLiftUp(); + /* 80590C6C */ void typeA_modeLiftDown(); + /* 80590C70 */ void init_typeA_modeRotate(); + /* 80590CE4 */ void typeA_modeRotate(); + /* 80590E24 */ void typeA_modeEnd(); + /* 80590E28 */ void init_typeB_modeWait(); + /* 80590E38 */ void typeB_modeWait(); + /* 80590E8C */ void init_typeB_modeMholeOn(); + /* 80590EF4 */ void typeB_modeMholeOn(); + /* 80590F14 */ void init_typeB_modeLiftUp(); + /* 80590F30 */ void typeB_modeLiftUp(); + /* 80591004 */ void typeB_modeLiftDown(); + /* 805910E8 */ void init_typeB_modeRotate(); + /* 80591160 */ void typeB_modeRotate(); + /* 805912AC */ void typeB_modeEnd(); + /* 805912B0 */ void init_typeC_modeWait(); + /* 805912C0 */ void typeC_modeWait(); + /* 80591314 */ void init_typeC_modeMholeOn(); + /* 8059137C */ void typeC_modeMholeOn(); + /* 8059139C */ void init_typeC_modeLiftUp(); + /* 805913B8 */ void typeC_modeLiftUp(); + /* 8059148C */ void init_typeC_modeLiftDown(); + /* 805914A8 */ void typeC_modeLiftDown(); + /* 8059158C */ void init_typeC_modeRotate(); + /* 80591604 */ void typeC_modeRotate(); + /* 80591750 */ void typeC_modeEnd(); + /* 80591754 */ void init_typeD_modeWait(); + /* 80591764 */ void typeD_modeWait(); + /* 805917B8 */ void init_typeD_modeMholeOn(); + /* 80591820 */ void typeD_modeMholeOn(); + /* 80591840 */ void init_typeD_modeLiftUp(); + /* 8059185C */ void typeD_modeLiftUp(); + /* 80591930 */ void init_typeD_modeLiftDown(); + /* 8059194C */ void typeD_modeLiftDown(); + /* 80591A30 */ void init_typeD_modeRotate(); + /* 80591AA8 */ void typeD_modeRotate(); + /* 80591BF4 */ void typeD_modeEnd(); + /* 80591BF8 */ void setMagneHoleEffect(); + /* 80591BFC */ void endMagneHoleEffect(); + /* 80591C38 */ void calcHimo(); + /* 80591E18 */ void seStart_MOVESTART(); + /* 80591E80 */ void seStartLevel_MOVE(); + /* 80591EE8 */ void seStart_STOP(); + /* 80591F50 */ void seStartLevel_UP(); + /* 80591FB8 */ void seStartLevel_DOWN(); + /* 80592020 */ void seStart_SWING(); + /* 80592088 */ void Draw(); + /* 805923C4 */ void debugDraw(); + /* 805923C8 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0xa6c - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjMarm_c) == 0xa6c); + #endif /* D_A_OBJ_MAGNE_ARM_H */ diff --git a/include/rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.h b/include/rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.h index 08bd39b54c1..77075dc0714 100644 --- a/include/rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.h +++ b/include/rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.h @@ -1,5 +1,27 @@ #ifndef D_A_OBJ_MAKI_H #define D_A_OBJ_MAKI_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class obj_maki_class + * @brief Stick Bundle? + * + * @details + * + */ +class obj_maki_class : public fopAc_ac_c { +private: + /* 0x568 */ u8 field_0x568[0x730 - 0x568]; +}; +STATIC_ASSERT(sizeof(obj_maki_class) == 0x730); + +class daObj_Maki_HIO_c { +public: + /* 80C8FE0C */ daObj_Maki_HIO_c(); + /* 80C9089C */ ~daObj_Maki_HIO_c(); +}; + #endif /* D_A_OBJ_MAKI_H */ diff --git a/include/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.h b/include/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.h index 04cb3f2a253..13025d92600 100644 --- a/include/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.h +++ b/include/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.h @@ -1,5 +1,65 @@ #ifndef D_A_OBJ_MASTER_SWORD_H #define D_A_OBJ_MASTER_SWORD_H +#include "f_op/f_op_actor_mng.h" +#include "d/cc/d_cc_d.h" + +class daObjMasterSword_c; +typedef void (daObjMasterSword_c::*actionFunc)(); + +/** + * @ingroup actors-objects + * @class daObjMasterSword_c + * @brief Master Sword + * + * @details + * + */ +class daObjMasterSword_c : public fopAc_ac_c { +public: + enum Mode_e { + MODE_0_e, + }; + + /* 80C90AF8 */ void initWait(); + /* 80C90B50 */ void executeWait(); + /* 80C90C50 */ static int createHeapCallBack(fopAc_ac_c* i_this); + /* 80C90C70 */ int CreateHeap(); + /* 80C90DB8 */ int create(); + /* 80C90F6C */ void create_init(); + /* 80C91448 */ ~daObjMasterSword_c(); + /* 80C91714 */ int draw(); + + inline void initCollision(); + inline void setCollision(); + inline void initBaseMtx(); + inline void setAction(Mode_e i_mode); + inline void callInit(); + inline void callExecute(); + inline int execute(); + + f32 attr() const { return mAttr; } + + u8 getEventID() { return (fopAcM_GetParam(this) >> 0x10) & 0xFF; } + u16 getFlagNo() { return fopAcM_GetParam(this) & 0xFFFF; } + + static f32 const mAttr; + // static actionFunc ActionTable[]; + static u8 ActionTable[24]; + +private: + /* 0x568 */ J3DModel* mpModel; + /* 0x56C */ request_of_phase_process_class mPhase; + /* 0x574 */ mDoExt_btkAnm mBtk; + /* 0x58C */ mDoExt_brkAnm mBrk; + /* 0x5A4 */ dCcD_Stts mCcStts; + /* 0x5E0 */ dCcD_Cyl mCyl; + /* 0x71C */ actionFunc* mActionFunc; + /* 0x720 */ Mode_e mMode; + /* 0x724 */ u32 mShadowKey; + /* 0x728 */ cBgS_PolyInfo field_0x728; + /* 0x738 */ f32 field_0x738; +}; +STATIC_ASSERT(sizeof(daObjMasterSword_c) == 0x73C); #endif /* D_A_OBJ_MASTER_SWORD_H */ diff --git a/include/rel/d/a/obj/d_a_obj_mato/d_a_obj_mato.h b/include/rel/d/a/obj/d_a_obj_mato/d_a_obj_mato.h index 6bea2c93274..1b80d121bc2 100644 --- a/include/rel/d/a/obj/d_a_obj_mato/d_a_obj_mato.h +++ b/include/rel/d/a/obj/d_a_obj_mato/d_a_obj_mato.h @@ -1,6 +1,41 @@ #ifndef D_A_OBJ_MATO_H #define D_A_OBJ_MATO_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjMATO_c + * @brief Target (???) + * + * @details + * + */ +class daObjMATO_c : public fopAc_ac_c { +public: + /* 80C91B58 */ void setAction(void (daObjMATO_c::*)(int), int); + /* 80C91D48 */ void action(); + /* 80C91DE4 */ void hit_check(); + /* 80C91ECC */ void start_wait(int); + /* 80C91F74 */ void wait(int); + /* 80C92044 */ void disappear(int); + /* 80C921A8 */ void getRupee(int); + /* 80C922AC */ void execute(); + /* 80C92380 */ void _delete(); + /* 80C9243C */ void setBaseMtx(); + /* 80C92650 */ void mato_init(); + /* 80C927AC */ void create(); + +private: + /* 0x568 */ u8 field_0x568[0x39f8 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjMATO_c) == 0x39f8); + +struct MatoData_s { +public: + /* 80C92924 */ ~MatoData_s(); + /* 80C92A50 */ MatoData_s(); +}; + #endif /* D_A_OBJ_MATO_H */ diff --git a/include/rel/d/a/obj/d_a_obj_metalbox/d_a_obj_metalbox.h b/include/rel/d/a/obj/d_a_obj_metalbox/d_a_obj_metalbox.h index dd4e1ed3b7b..b83e4cb2f1e 100644 --- a/include/rel/d/a/obj/d_a_obj_metalbox/d_a_obj_metalbox.h +++ b/include/rel/d/a/obj/d_a_obj_metalbox/d_a_obj_metalbox.h @@ -1,6 +1,31 @@ #ifndef D_A_OBJ_METALBOX_H #define D_A_OBJ_METALBOX_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjMBox_c + * @brief Metal Box + * + * @details + * + */ +class daObjMBox_c : public fopAc_ac_c { +public: + /* 80592E98 */ void initBaseMtx(); + /* 80592ED4 */ void setBaseMtx(); + /* 80592F48 */ void Create(); + /* 80592FD4 */ void CreateHeap(); + /* 80593044 */ void create(); + /* 805932C4 */ void Execute(f32 (**)[3][4]); + /* 805932F0 */ void Draw(); + /* 80593394 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x944 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjMBox_c) == 0x944); + #endif /* D_A_OBJ_METALBOX_H */ diff --git a/include/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.h b/include/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.h index 7f65865c113..2636c89e415 100644 --- a/include/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.h +++ b/include/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.h @@ -4,6 +4,14 @@ #include "d/bg/d_bg_s_movebg_actor.h" #include "d/com/d_com_inf_game.h" +/** + * @ingroup actors-objects + * @class daObjMGate_c + * @brief Ordon Spring Gate + * + * @details + * + */ class daObjMGate_c : public dBgS_MoveBgActor { public: enum Kind_e { @@ -44,5 +52,6 @@ class daObjMGate_c : public dBgS_MoveBgActor { /* 0x5C8 */ int mCounter; /* 0x5CC */ s16 mGateKeyAngle; }; +STATIC_ASSERT(sizeof(daObjMGate_c) == 0x5D0); #endif /* D_A_OBJ_MGATE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_mhole/d_a_obj_mhole.h b/include/rel/d/a/obj/d_a_obj_mhole/d_a_obj_mhole.h index be572abd4cc..f1d2166b723 100644 --- a/include/rel/d/a/obj/d_a_obj_mhole/d_a_obj_mhole.h +++ b/include/rel/d/a/obj/d_a_obj_mhole/d_a_obj_mhole.h @@ -1,5 +1,34 @@ #ifndef D_A_OBJ_MHOLE_H #define D_A_OBJ_MHOLE_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjMHole_c + * @brief Magnet Hole + * + * @details + * + */ +class daObjMHole_c : public fopAc_ac_c { +public: + /* 80C92FD8 */ void initBaseMtx(); + /* 80C93014 */ void setBaseMtx(); + /* 80C9307C */ void Create(); + /* 80C93198 */ void checkParent(); + /* 80C93204 */ void CreateHeap(); + /* 80C934E0 */ void create(); + /* 80C936A8 */ void execute(); + /* 80C93928 */ void effectSet(); + /* 80C93A88 */ void effectEnd(); + /* 80C93ADC */ void draw(); + /* 80C93CAC */ void _delete(); + +private: + /* 0x568 */ u8 field_0x568[0x734 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjMHole_c) == 0x734); + #endif /* D_A_OBJ_MHOLE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_mie/d_a_obj_mie.h b/include/rel/d/a/obj/d_a_obj_mie/d_a_obj_mie.h index ed77cfec954..9d6d8220297 100644 --- a/include/rel/d/a/obj/d_a_obj_mie/d_a_obj_mie.h +++ b/include/rel/d/a/obj/d_a_obj_mie/d_a_obj_mie.h @@ -1,5 +1,45 @@ #ifndef D_A_OBJ_MIE_H #define D_A_OBJ_MIE_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObj_Mie_c + * @brief Gengle (Cat) + * + * @details + * + */ +class daObj_Mie_c : public fopAc_ac_c { +public: + /* 80C93FCC */ ~daObj_Mie_c(); + /* 80C941C8 */ void create(); + /* 80C945E8 */ void CreateHeap(); + /* 80C94674 */ void Delete(); + /* 80C946A8 */ void Execute(); + /* 80C95140 */ void Draw(); + /* 80C952D8 */ void createHeapCallBack(fopAc_ac_c*); + /* 80C952F8 */ void srchPouyaa(void*, void*); + /* 80C9536C */ void setEnvTevColor(); + /* 80C953C8 */ void setRoomNo(); + /* 80C9540C */ void setMtx(); + /* 80C954BC */ void calcRollAngle(s16, int); + /* 80C9555C */ void getWallAngle(s16, s16*); + /* 80C956EC */ void setSmokePrtcl(); + /* 80C95768 */ void setWaterPrtcl(); + /* 80C95890 */ void setHamonPrtcl(); +private: + /* 0x568 */ u8 field_0x568[0xa50 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObj_Mie_c) == 0xa50); + +class daObj_Mie_Param_c { +public: + /* 80C95A40 */ ~daObj_Mie_Param_c(); + + static u8 const m[44]; +}; + #endif /* D_A_OBJ_MIE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.h b/include/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.h index c437a167c5e..ee5a4a7ee69 100644 --- a/include/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.h +++ b/include/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.h @@ -4,7 +4,18 @@ #include "d/com/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" -struct daObjMovebox { +/** + * @ingroup actors-objects + * @class daObjMovebox + * @brief Multi-Purpose Moving Box + * + * @details Multi-purpose moving box actor. + * Used for: Goron Mines Push Block, Death Mountain Block, + * Large Wooden Crate, Sacred Grove Block, + * Arbiter's Grounds Block (2 of them), Kakariko Graveyard Gravestone + * + */ +class daObjMovebox : public fopAc_ac_c { struct Act_c { struct Prm_e {}; @@ -69,6 +80,10 @@ struct daObjMovebox { static u8 M_wrt_work[84]; static u8 M_wall_work[2576]; }; + +private: + /* 0x568 */ u8 field_0x568[0x90c - 0x568]; }; +STATIC_ASSERT(sizeof(daObjMovebox) == 0x90C); #endif /* D_A_OBJ_MOVEBOX_H */ diff --git a/include/rel/d/a/obj/d_a_obj_msima/d_a_obj_msima.h b/include/rel/d/a/obj/d_a_obj_msima/d_a_obj_msima.h index d92734bd74b..b1cfcca34ae 100644 --- a/include/rel/d/a/obj/d_a_obj_msima/d_a_obj_msima.h +++ b/include/rel/d/a/obj/d_a_obj_msima/d_a_obj_msima.h @@ -1,6 +1,32 @@ #ifndef D_A_OBJ_MSIMA_H #define D_A_OBJ_MSIMA_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class obj_msima_class + * @brief Dangoro Boss Stage (Magnetic Island) + * + * @details + * + */ +class obj_msima_class : public fopAc_ac_c { +private: + /* 0x568 */ u8 field_0x568[0x8a4 - 0x568]; +}; +STATIC_ASSERT(sizeof(obj_msima_class) == 0x8a4); + +struct ms_chain_s { + /* 80C9CA60 */ ~ms_chain_s(); + /* 80C9CA9C */ ms_chain_s(); +}; + +class daObj_Msima_HIO_c { +public: + /* 80C9B40C */ daObj_Msima_HIO_c(); + /* 80C9CAA0 */ ~daObj_Msima_HIO_c(); +}; + #endif /* D_A_OBJ_MSIMA_H */ diff --git a/include/rel/d/a/obj/d_a_obj_mvstair/d_a_obj_mvstair.h b/include/rel/d/a/obj/d_a_obj_mvstair/d_a_obj_mvstair.h index cb9f9508533..9f26db82181 100644 --- a/include/rel/d/a/obj/d_a_obj_mvstair/d_a_obj_mvstair.h +++ b/include/rel/d/a/obj/d_a_obj_mvstair/d_a_obj_mvstair.h @@ -1,6 +1,47 @@ #ifndef D_A_OBJ_MVSTAIR_H #define D_A_OBJ_MVSTAIR_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjStair_c + * @brief Moving Stairs + * + * @details + * + */ +class daObjStair_c : public fopAc_ac_c { +public: + /* 80C9D098 */ void initBaseMtx(); + /* 80C9D0D4 */ void setBaseMtx(); + /* 80C9D148 */ void Create(); + /* 80C9D2B8 */ void CreateHeap(); + /* 80C9D338 */ void create1st(); + /* 80C9D41C */ void event_proc_call(); + /* 80C9D4D8 */ void mode_proc_call(); + /* 80C9D594 */ void Execute(f32 (**)[3][4]); + /* 80C9D710 */ void Draw(); + /* 80C9D7B4 */ void Delete(); + /* 80C9D82C */ void actionWait(); + /* 80C9D8EC */ void actionOrderEvent(); + /* 80C9D95C */ void actionEvent(); + /* 80C9D9BC */ bool actionEnd(); + /* 80C9D9C4 */ void modeWaitUpperInit(); + /* 80C9D9F4 */ void modeWaitUpper(); + /* 80C9DA98 */ void modeUpperInit(); + /* 80C9DADC */ void modeUpper(); + /* 80C9DF18 */ void modeWaitLowerInit(); + /* 80C9DF60 */ void modeWaitLower(); + /* 80C9E004 */ void modeLowerInit(); + /* 80C9E034 */ void modeLower(); + /* 80C9E3D8 */ void setParticle(); + /* 80C9E5A0 */ void removeParticle(); + +private: + /* 0x568 */ u8 field_0x568[0x66c - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjStair_c) == 0x66c); + #endif /* D_A_OBJ_MVSTAIR_H */ diff --git a/include/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan.h b/include/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan.h index 753546152c2..f4a0240a3ef 100644 --- a/include/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan.h +++ b/include/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan.h @@ -5,6 +5,14 @@ class dBgW; +/** + * @ingroup actors-objects + * @class obj_myogan_class + * @brief ??? + * + * @details + * + */ class obj_myogan_class : public fopAc_ac_c { public: /* 0x568 */ request_of_phase_process_class mPhase; diff --git a/include/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.h b/include/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.h index 21a0eae03eb..6c883963d3e 100644 --- a/include/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.h +++ b/include/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.h @@ -1,6 +1,51 @@ #ifndef D_A_OBJ_NAGAISU_H #define D_A_OBJ_NAGAISU_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "d/cc/d_cc_d.h" +#include "d/d_model.h" + +/** + * @ingroup actors-objects + * @class daObjNagaisu_c + * @brief Couch + * + * @details + * + */ +class daObjNagaisu_c : public fopAc_ac_c { +public: + /* 80C9F3D8 */ daObjNagaisu_c(); + /* 80C9F4B8 */ ~daObjNagaisu_c(); + /* 80C9F5A8 */ void createHeap(); + /* 80C9F668 */ void create(); + /* 80C9F7A8 */ void Delete(); + /* 80C9F81C */ void draw(); + /* 80C9F8C4 */ void execute(); + /* 80C9F914 */ void init(); + /* 80C9F944 */ void setIsu(); + + static u8 const REMOVE_ISU_IDX[28]; +private: + /* 0x568 */ u8 field_0x568[0xb6e4 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjNagaisu_c) == 0xb6e4); + +// child seat / couch? +class daObjIsuChild_c { +public: + /* 80C9FA90 */ daObjIsuChild_c(); + /* 80C9FCDC */ ~daObjIsuChild_c(); + /* 80C9FD4C */ void createHeap(); + /* 80C9FE28 */ void create(daObjNagaisu_c*, dCcD_Stts*); + /* 80C9FF54 */ void execute(); + /* 80CA0034 */ void draw(dMdl_c*); + /* 80CA00B8 */ void Delete(); + /* 80CA0118 */ void chkHit(); + /* 80CA0180 */ void callEmt(); + + static u8 const s_CcDCyl[68]; +}; + #endif /* D_A_OBJ_NAGAISU_H */ diff --git a/include/rel/d/a/obj/d_a_obj_nameplate/d_a_obj_nameplate.h b/include/rel/d/a/obj/d_a_obj_nameplate/d_a_obj_nameplate.h index 7abe15fce98..2f6e075dc61 100644 --- a/include/rel/d/a/obj/d_a_obj_nameplate/d_a_obj_nameplate.h +++ b/include/rel/d/a/obj/d_a_obj_nameplate/d_a_obj_nameplate.h @@ -1,5 +1,40 @@ #ifndef D_A_OBJ_NAMEPLATE_H #define D_A_OBJ_NAMEPLATE_H +#include "f_op/f_op_actor_mng.h" +#include "d/cc/d_cc_d.h" + +/** + * @ingroup actors-objects + * @class daObjNameplate_c + * @brief Ordon Village Nameplate + * + * @details + * + */ +class daObjNameplate_c : public fopAc_ac_c { +public: + /* 80594098 */ void create_init(); + /* 8059415C */ void initBaseMtx(); + /* 8059417C */ void setBaseMtx(); + /* 80594248 */ void initCcSphere(); + /* 805942B8 */ void setCcSphere(); + /* 8059434C */ void calcAngle(); + /* 805945CC */ void calcSpring(); + /* 80594754 */ void checkHitAngle(); + /* 805947F8 */ void messageProc(); + + static u8 const M_attr[32]; + +private: + /* 0x568 */ u8 field_0x568[0x780 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjNameplate_c) == 0x780); + +struct daObj { +public: + /* 80037900 */ void HitSeStart(cXyz const*, int, dCcD_GObjInf const*, u32); +}; + #endif /* D_A_OBJ_NAMEPLATE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.h b/include/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.h index 28f58865c3c..10166d108cc 100644 --- a/include/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.h +++ b/include/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.h @@ -1,6 +1,47 @@ #ifndef D_A_OBJ_NAN_H #define D_A_OBJ_NAN_H -#include "dolphin/types.h" +#include "d/d_insect.h" + +/** + * @ingroup actors-objects + * @class daObjNAN_c + * @brief Insect - Phasmid + * + * @details + * + */ +class daObjNAN_c : public dInsect_c { +public: + /* 80CA05D4 */ void setAction(void (daObjNAN_c::*)()); + /* 80CA0978 */ void nan_posMove(); + /* 80CA0A2C */ void turn(); + /* 80CA0D9C */ void nan_WalkAnm(); + /* 80CA0E7C */ void wait(); + /* 80CA1184 */ void walk(); + /* 80CA1904 */ void bin_wait(); + /* 80CA1A20 */ void bin_action(); + /* 80CA1B50 */ void nan_setParticle(); + /* 80CA1D5C */ void hook(); + /* 80CA1F60 */ void boomerang(); + /* 80CA2368 */ void drop(); + /* 80CA2658 */ void hit_check(); + /* 80CA270C */ void action(); + /* 80CA276C */ void execute(); + /* 80CA2904 */ void _delete(); + /* 80CA296C */ void setBaseMtx(); + /* 80CA2B68 */ void create(); + +private: + /* 0x590 */ u8 field_0x568[0x800 - 0x590]; +}; +STATIC_ASSERT(sizeof(daObjNAN_c) == 0x800); + +class daObj_NanHIO_c { +public: + /* 80CA05AC */ daObj_NanHIO_c(); + /* 80CA30D0 */ ~daObj_NanHIO_c(); +}; + #endif /* D_A_OBJ_NAN_H */ diff --git a/include/rel/d/a/obj/d_a_obj_ndoor/d_a_obj_ndoor.h b/include/rel/d/a/obj/d_a_obj_ndoor/d_a_obj_ndoor.h index 039d516fe32..49d355000c7 100644 --- a/include/rel/d/a/obj/d_a_obj_ndoor/d_a_obj_ndoor.h +++ b/include/rel/d/a/obj/d_a_obj_ndoor/d_a_obj_ndoor.h @@ -1,5 +1,21 @@ #ifndef D_A_OBJ_NDOOR_H #define D_A_OBJ_NDOOR_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class obj_ndoor_class + * @brief Cat Door? + * + * @details + * + */ +class obj_ndoor_class : public fopAc_ac_c { +private: + /* 0x568 */ u8 field_0x568[0x718 - 0x568]; +}; +STATIC_ASSERT(sizeof(obj_ndoor_class) == 0x718); + #endif /* D_A_OBJ_NDOOR_H */ diff --git a/include/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu.h b/include/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu.h index 1b1b7371b24..43640cfcc03 100644 --- a/include/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu.h +++ b/include/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu.h @@ -1,6 +1,44 @@ #ifndef D_A_OBJ_NOUGU_H #define D_A_OBJ_NOUGU_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObj_Nougu_c + * @brief Farm Tools + * + * @details + * + */ +class daObj_Nougu_c : public fopAc_ac_c { +public: + /* 80CA3C0C */ ~daObj_Nougu_c(); + /* 80CA3E24 */ void create(); + /* 80CA4328 */ void CreateHeap(); + /* 80CA43A0 */ void Delete(); + /* 80CA43D4 */ void Execute(); + /* 80CA45F4 */ void Draw(); + /* 80CA46B8 */ void createHeapCallBack(fopAc_ac_c*); + /* 80CA46D8 */ void getResName(); + /* 80CA46E8 */ void isDelete(); + /* 80CA4708 */ void setEnvTevColor(); + /* 80CA4764 */ void setRoomNo(); + /* 80CA47A4 */ void setMtx(); + + static u8 mCcDSph[64]; + +private: + /* 0x568 */ u8 field_0x568[0xe30 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObj_Nougu_c) == 0xe30); + +class daObj_Nougu_Param_c { +public: + /* 80CA494C */ ~daObj_Nougu_Param_c(); + + static u8 const m[16]; +}; + #endif /* D_A_OBJ_NOUGU_H */ diff --git a/include/rel/d/a/obj/d_a_obj_octhashi/d_a_obj_octhashi.h b/include/rel/d/a/obj/d_a_obj_octhashi/d_a_obj_octhashi.h index e206ec3932b..826165e7da5 100644 --- a/include/rel/d/a/obj/d_a_obj_octhashi/d_a_obj_octhashi.h +++ b/include/rel/d/a/obj/d_a_obj_octhashi/d_a_obj_octhashi.h @@ -1,5 +1,39 @@ #ifndef D_A_OBJ_OCTHASHI_H #define D_A_OBJ_OCTHASHI_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjOCTHASHI_c + * @brief Morpheel Pillar + * + * @details + * + */ +class daObjOCTHASHI_c : public fopAc_ac_c { +public: + /* 80CA4BB8 */ void initCcCylinder(); + /* 80CA4DFC */ void SetCoSph(); + /* 80CA4EA4 */ void SetCoCyl(); + /* 80CA4F24 */ void HakaiSet2(int); + /* 80CA52F0 */ void HakaiMotion2(); + /* 80CA54E4 */ void CylAction(); + /* 80CA55C4 */ void SphAction(); + /* 80CA5844 */ void SphAction2(); + /* 80CA58F4 */ void Action(); + /* 80CA59BC */ void setBaseMtx(); + /* 80CA5AE0 */ void CreateHeap(); + /* 80CA5B98 */ void create(); + /* 80CA62A4 */ void Create(); + /* 80CA62F8 */ void Execute(f32 (**)[3][4]); + /* 80CA636C */ void Draw(); + /* 80CA6444 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x14b0 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjOCTHASHI_c) == 0x14b0); + #endif /* D_A_OBJ_OCTHASHI_H */ diff --git a/include/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.h b/include/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.h index 8bb04cf1726..b4f57032e4b 100644 --- a/include/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.h +++ b/include/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.h @@ -3,6 +3,14 @@ #include "d/com/d_com_inf_game.h" +/** + * @ingroup actors-objects + * @class daObj_Oiltubo_c + * @brief Oil Jar + * + * @details + * + */ class daObj_Oiltubo_c : public fopAc_ac_c { public: typedef int (daObj_Oiltubo_c::*processFn)(void*); @@ -28,6 +36,7 @@ class daObj_Oiltubo_c : public fopAc_ac_c { static const dCcD_SrcGObjInf mCcDObjInfo; static dCcD_SrcCyl mCcDCyl; +private: /* 0x568 */ request_of_phase_process_class mPhase; /* 0x570 */ J3DModel* mpModel; /* 0x574 */ J3DModel* mpBModel; @@ -44,7 +53,9 @@ class daObj_Oiltubo_c : public fopAc_ac_c { /* 0xAC8 */ u32 mShadowKey; /* 0xACC */ u16 mMode; +public: /* 80CA7628 */ virtual ~daObj_Oiltubo_c() {} }; +STATIC_ASSERT(sizeof(daObj_Oiltubo_c) == 0xAD4); #endif /* D_A_OBJ_OILTUBO_H */ diff --git a/include/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.h b/include/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.h index 22a88ac9c27..b2e0bb13e2e 100644 --- a/include/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.h +++ b/include/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.h @@ -4,6 +4,14 @@ #include "d/bg/d_bg_s_movebg_actor.h" #include "d/com/d_com_inf_game.h" +/** + * @ingroup actors-objects + * @class daObjOnsen_c + * @brief Hot Spring + * + * @details + * + */ class daObjOnsen_c : public dBgS_MoveBgActor { public: /* 80CA7B58 */ void initBaseMtx(); @@ -17,10 +25,12 @@ class daObjOnsen_c : public dBgS_MoveBgActor { u32 getType() { return fopAcM_GetParamBit(this, 0, 8); } +private: /* 0x5A0 */ request_of_phase_process_class mPhaseReq; /* 0x5A8 */ J3DModel* mpModel[2]; /* 0x5B0 */ mDoExt_btkAnm* mpBtk; /* 0x5B4 */ u8 mType; -}; // Size: 0x5B8 +}; +STATIC_ASSERT(sizeof(daObjOnsen_c) == 0x5B8); #endif /* D_A_OBJ_ONSEN_H */ diff --git a/include/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.h b/include/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.h index ae5ea7363c0..ed941652c46 100644 --- a/include/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.h +++ b/include/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.h @@ -3,6 +3,14 @@ #include "d/com/d_com_inf_game.h" +/** + * @ingroup actors-objects + * @class daObjOnsenFire_c + * @brief Hot Spring Fire + * + * @details + * + */ class daObjOnsenFire_c : public fopAc_ac_c { public: /* 80CA8278 */ int create(); diff --git a/include/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.h b/include/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.h index 4f8b129c38a..7f014c66324 100644 --- a/include/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.h +++ b/include/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.h @@ -1,6 +1,54 @@ #ifndef D_A_OBJ_ONSENTARU_H #define D_A_OBJ_ONSENTARU_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daOnsTaru_c + * @brief Hot Spring Water Barrel + * + * @details + * + */ +class daOnsTaru_c : public fopAc_ac_c { +public: + /* 80CA86C0 */ void setBaseMtx(); + /* 80CA8748 */ void CreateHeap(); + /* 80CA87B4 */ void create(); + /* 80CA8C20 */ void createHeapCallBack(fopAc_ac_c*); + /* 80CA8C4C */ void chkSinkAll(); + /* 80CA8C70 */ void chkWaterLineIn(); + /* 80CA8C94 */ void bgCheck(); + /* 80CA8F38 */ void Execute(); + /* 80CA9184 */ void mode_proc_call(); + /* 80CA929C */ void mode_init_wait(); + /* 80CA92CC */ void mode_proc_wait(); + /* 80CA92F0 */ void mode_init_carry(); + /* 80CA9320 */ void mode_proc_carry(); + /* 80CA93C0 */ void mode_init_drop(); + /* 80CA9400 */ void mode_proc_drop(); + /* 80CA9424 */ void mode_init_break(); + /* 80CA9514 */ void mode_proc_break(); + /* 80CA9518 */ void mode_init_sink(); + /* 80CA9530 */ void mode_proc_sink(); + /* 80CA9620 */ void breakEffSet(); + /* 80CA98B8 */ void Draw(); + /* 80CA995C */ void Delete(); + + static u8 const mCcDObjInfo[48]; + static u8 mCcDCyl[68]; + +private: + /* 0x568 */ u8 field_0x568[0x948 - 0x568]; +}; +STATIC_ASSERT(sizeof(daOnsTaru_c) == 0x948); + +class daOnsTaru_HIO_c { +public: + /* 80CA85CC */ daOnsTaru_HIO_c(); + /* 80CA9A78 */ ~daOnsTaru_HIO_c(); +}; + #endif /* D_A_OBJ_ONSENTARU_H */ diff --git a/include/rel/d/a/obj/d_a_obj_ornament_cloth/d_a_obj_ornament_cloth.h b/include/rel/d/a/obj/d_a_obj_ornament_cloth/d_a_obj_ornament_cloth.h index 4e80df662e4..f22eef6981e 100644 --- a/include/rel/d/a/obj/d_a_obj_ornament_cloth/d_a_obj_ornament_cloth.h +++ b/include/rel/d/a/obj/d_a_obj_ornament_cloth/d_a_obj_ornament_cloth.h @@ -1,6 +1,36 @@ #ifndef D_A_OBJ_ORNAMENT_CLOTH_H #define D_A_OBJ_ORNAMENT_CLOTH_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjOnCloth_c + * @brief Ordon Village Flag + * + * @details + * + */ +class daObjOnCloth_c : public fopAc_ac_c { +public: + /* 80595038 */ void create_init(); + /* 80595158 */ void initBaseMtx(); + /* 80595178 */ void setBaseMtx(); + /* 805951DC */ void setNormalClothPos(); + /* 805954B0 */ void calcJointAngle(); + /* 80595638 */ void checkPlayerMove(); + + static u8 const M_attr[48]; +private: + /* 0x568 */ u8 field_0x568[0x6c8 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjOnCloth_c) == 0x6c8); + +class ClothJoint_c { +public: + /* 80595B9C */ ~ClothJoint_c(); + /* 80595CA8 */ ClothJoint_c(); +}; + #endif /* D_A_OBJ_ORNAMENT_CLOTH_H */ diff --git a/include/rel/d/a/obj/d_a_obj_pdoor/d_a_obj_pdoor.h b/include/rel/d/a/obj/d_a_obj_pdoor/d_a_obj_pdoor.h index c8716c8919a..e99dc79b4a4 100644 --- a/include/rel/d/a/obj/d_a_obj_pdoor/d_a_obj_pdoor.h +++ b/include/rel/d/a/obj/d_a_obj_pdoor/d_a_obj_pdoor.h @@ -1,6 +1,36 @@ #ifndef D_A_OBJ_PDOOR_H #define D_A_OBJ_PDOOR_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjPDoor_c + * @brief Push Door + * + * @details + * + */ +class daObjPDoor_c : public fopAc_ac_c { +public: + /* 80CA9F9C */ void initBaseMtx(); + /* 80CA9FD8 */ void setBaseMtx(); + /* 80CAA03C */ void Create(); + /* 80CAA14C */ void CreateHeap(); + /* 80CAA1BC */ void create1st(); + /* 80CAA23C */ void Execute(f32 (**)[3][4]); + /* 80CAA290 */ void mode_proc_call(); + /* 80CAA31C */ void init_modeWait(); + /* 80CAA354 */ void modeWait(); + /* 80CAA698 */ void init_modeRotate(); + /* 80CAA6B4 */ void modeRotate(); + /* 80CAA968 */ void Draw(); + /* 80CAAA0C */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x5c4 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjPDoor_c) == 0x5c4); + #endif /* D_A_OBJ_PDOOR_H */ diff --git a/include/rel/d/a/obj/d_a_obj_pdtile/d_a_obj_pdtile.h b/include/rel/d/a/obj/d_a_obj_pdtile/d_a_obj_pdtile.h index 7b60d725265..6786b8db881 100644 --- a/include/rel/d/a/obj/d_a_obj_pdtile/d_a_obj_pdtile.h +++ b/include/rel/d/a/obj/d_a_obj_pdtile/d_a_obj_pdtile.h @@ -1,5 +1,32 @@ #ifndef D_A_OBJ_PDTILE_H #define D_A_OBJ_PDTILE_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjPDtile_c + * @brief P - Drop Tile + * + * @details + * + */ +class daObjPDtile_c : public fopAc_ac_c { +public: + /* 80CAACE0 */ void create1st(); + /* 80CAAE80 */ void setMtx(); + /* 80CAAF90 */ void rideActor(fopAc_ac_c*); + /* 80CAB1F0 */ void CreateHeap(); + /* 80CAB258 */ void Create(); + /* 80CAB374 */ void Execute(f32 (**)[3][4]); + /* 80CABF50 */ void Draw(); + /* 80CAC094 */ void Delete(); + /* 80CAC374 */ ~daObjPDtile_c(); + +private: + /* 0x568 */ u8 field_0x568[0x7fc - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjPDtile_c) == 0x7fc); + #endif /* D_A_OBJ_PDTILE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_pdwall/d_a_obj_pdwall.h b/include/rel/d/a/obj/d_a_obj_pdwall/d_a_obj_pdwall.h index 0145f82d344..4571bf6cbc6 100644 --- a/include/rel/d/a/obj/d_a_obj_pdwall/d_a_obj_pdwall.h +++ b/include/rel/d/a/obj/d_a_obj_pdwall/d_a_obj_pdwall.h @@ -1,6 +1,31 @@ #ifndef D_A_OBJ_PDWALL_H #define D_A_OBJ_PDWALL_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjPDwall_c + * @brief P - D Wall? + * + * @details + * + */ +class daObjPDwall_c : public fopAc_ac_c { +public: + /* 80CAC7F8 */ void create1st(); + /* 80CAC8DC */ void setMtx(); + /* 80CACA44 */ void CreateHeap(); + /* 80CACBA8 */ void Create(); + /* 80CACCE0 */ void Execute(f32 (**)[3][4]); + /* 80CACF14 */ void Draw(); + /* 80CACFD4 */ void Delete(); + /* 80CAD140 */ ~daObjPDwall_c(); + +private: + /* 0x568 */ u8 field_0x568[0xa18 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjPDwall_c) == 0xa18); + #endif /* D_A_OBJ_PDWALL_H */ diff --git a/include/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture.h b/include/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture.h index 1c35caf2538..12800a93aaf 100644 --- a/include/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture.h +++ b/include/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture.h @@ -1,6 +1,45 @@ #ifndef D_A_OBJ_PICTURE_H #define D_A_OBJ_PICTURE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "d/cc/d_cc_d.h" + +/** + * @ingroup actors-objects + * @class daObjPicture_c + * @brief Hyrule Castle Painting + * + * @details + * + */ +class daObjPicture_c : public fopAc_ac_c { +public: + /* 80CAD318 */ daObjPicture_c(); + /* 80CAD6C8 */ ~daObjPicture_c(); + /* 80CAD908 */ void createHeap(); + /* 80CADC18 */ void create(); + /* 80CADFB0 */ void Delete(); + /* 80CAE05C */ void draw(); + /* 80CAE1B8 */ void execute(); + /* 80CAE510 */ void init(); + /* 80CAE5B0 */ void setPicModelMtx(); + /* 80CAE638 */ void setTmgModelMtx(); + /* 80CAE6C4 */ void getLinePosPic(int, cXyz*); + /* 80CAE744 */ void getPosTmg(cXyz*); + /* 80CAE76C */ void setLinePos(); + /* 80CAE8E8 */ void moveLineFall1(); + /* 80CAEA60 */ void moveLineFall2(); + /* 80CAED28 */ void chkHitRope(); + /* 80CAEDDC */ void chkHitBombTg(); + /* 80CAEE90 */ void setPicAtCol(); + + static u8 s_CcDCps[76]; + static u8 s_CcDCyl_pic_at[68]; + +private: + /* 0x568 */ u8 field_0x568[0xda0 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjPicture_c) == 0xda0); + #endif /* D_A_OBJ_PICTURE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_pillar/d_a_obj_pillar.h b/include/rel/d/a/obj/d_a_obj_pillar/d_a_obj_pillar.h index f9e12b49cfe..ee56bb13a19 100644 --- a/include/rel/d/a/obj/d_a_obj_pillar/d_a_obj_pillar.h +++ b/include/rel/d/a/obj/d_a_obj_pillar/d_a_obj_pillar.h @@ -1,5 +1,46 @@ #ifndef D_A_OBJ_PILLAR_H #define D_A_OBJ_PILLAR_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daPillar_c + * @brief Forest Temple Totem Pole + * + * @details + * + */ +class daPillar_c : public fopAc_ac_c { +public: + /* 80CAF4B4 */ void setBaseMtx(); + /* 80CAF5EC */ void Create(); + /* 80CAF7A8 */ void CreateHeap(); + /* 80CAF8A4 */ void create1st(); + /* 80CAFB44 */ void checkAttacked(); + /* 80CAFC08 */ void on_switch(); + /* 80CAFD64 */ void checkShake(); + /* 80CAFF60 */ void setShake_rcrash(); + /* 80CB01E0 */ void setShake_strong(); + /* 80CB022C */ void setShake_weak(); + /* 80CB0278 */ void switch_proc_call(); + /* 80CB031C */ void actionSwOnWait(); + /* 80CB0378 */ void actionSwOn(); + /* 80CB03CC */ void actionEnd(); + /* 80CB03D0 */ void Execute(f32 (**)[3][4]); + /* 80CB0658 */ void Draw(); + /* 80CB0740 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x750 - 0x568]; +}; +STATIC_ASSERT(sizeof(daPillar_c) == 0x750); + +class daPillar_HIO_c { +public: + /* 80CAF32C */ daPillar_HIO_c(); + /* 80CB0928 */ ~daPillar_HIO_c(); +}; + #endif /* D_A_OBJ_PILLAR_H */ diff --git a/include/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.h b/include/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.h index 15ef3017d44..91a91b74501 100644 --- a/include/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.h +++ b/include/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.h @@ -4,8 +4,16 @@ #include "d/com/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" +/** + * @ingroup actors-objects + * @class daObj_Pleaf_c + * @brief Ordon Pumpkin Vine + * + * @details + * + */ class daObj_Pleaf_c : public fopAc_ac_c { -public: +private: /* 0x568*/ u8 field_0x568[0x56C - 0x568]; /* 0x56C */ request_of_phase_process_class mPhaseReq; /* 0x574 */ J3DModel* mpModel; @@ -18,8 +26,7 @@ class daObj_Pleaf_c : public fopAc_ac_c { /* 0x944 */ u32 mShadowKey; /* 0x948 */ u8 mType; - u32 getType() { return 0; } - +public: /* 80CB0D4C */ virtual ~daObj_Pleaf_c(); /* 80CB0F08 */ int create(); /* 80CB134C */ int CreateHeap(); @@ -32,7 +39,10 @@ class daObj_Pleaf_c : public fopAc_ac_c { /* 80CB15E8 */ void setEnvTevColor(); /* 80CB1644 */ void setRoomNo(); /* 80CB1684 */ void setMtx(); + + u32 getType() { return 0; } }; +STATIC_ASSERT(sizeof(daObj_Pleaf_c) == 0x950); class daObj_Pleaf_Param_c { public: diff --git a/include/rel/d/a/obj/d_a_obj_poCandle/d_a_obj_poCandle.h b/include/rel/d/a/obj/d_a_obj_poCandle/d_a_obj_poCandle.h index 2c31d3a1370..23666979a13 100644 --- a/include/rel/d/a/obj/d_a_obj_poCandle/d_a_obj_poCandle.h +++ b/include/rel/d/a/obj/d_a_obj_poCandle/d_a_obj_poCandle.h @@ -1,6 +1,50 @@ #ifndef D_A_OBJ_POCANDLE_H #define D_A_OBJ_POCANDLE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daPoCandle_c + * @brief Poe Torch + * + * @details + * + */ +class daPoCandle_c : public fopAc_ac_c { +public: + /* 80CB1AE4 */ void setBaseMtx(); + /* 80CB1B6C */ void CreateHeap(); + /* 80CB1BD8 */ void create(); + /* 80CB1D74 */ void lightInit(); + /* 80CB1E00 */ void setLight(); + /* 80CB1E30 */ void cutLight(); + /* 80CB1E60 */ void pointLightProc(); + /* 80CB1F10 */ void Execute(f32 (**)[3][4]); + /* 80CB2140 */ void init_modeWait(); + /* 80CB214C */ void modeWait(); + /* 80CB21D8 */ void init_modeOnFire(); + /* 80CB22D4 */ void modeOnFire(); + /* 80CB22F4 */ void modeOnSwWait(); + /* 80CB2354 */ void init_modeEnd(); + /* 80CB2360 */ void modeEnd(); + /* 80CB2364 */ void eventStart(); + /* 80CB2388 */ void Draw(); + /* 80CB242C */ void Delete(); + /* 80CB2610 */ ~daPoCandle_c(); + + /* 80CB3E3C */ void getFirePos(); // implemented in d_a_obj_poFire.cpp + +private: + /* 0x568 */ u8 field_0x568[0x614 - 0x568]; +}; +STATIC_ASSERT(sizeof(daPoCandle_c) == 0x614); + +class daPoCandle_HIO_c { +public: + /* 80CB1A6C */ daPoCandle_HIO_c(); + /* 80CB2508 */ ~daPoCandle_HIO_c(); +}; + #endif /* D_A_OBJ_POCANDLE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.h b/include/rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.h index 7d5f527ee3f..7b4ffb903b2 100644 --- a/include/rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.h +++ b/include/rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.h @@ -1,6 +1,57 @@ #ifndef D_A_OBJ_POFIRE_H #define D_A_OBJ_POFIRE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "rel/d/a/obj/d_a_obj_poCandle/d_a_obj_poCandle.h" + +/** + * @ingroup actors-objects + * @class daPoFire_c + * @brief Poe Fire + * + * @details + * + */ +class daPoFire_c : public fopAc_ac_c { +public: + /* 80CB2A0C */ void setBaseMtx(); + /* 80CB2A74 */ void create(); + /* 80CB2BB8 */ void Execute(); + /* 80CB2BFC */ void procMain(); + /* 80CB2D84 */ void setFire(); + /* 80CB2F68 */ void searchCandle(void*, void*); + /* 80CB2FD4 */ void searchFireTag(void*, void*); + /* 80CB3024 */ void init_modeInitMove(); + /* 80CB30FC */ void modeInitMove(); + /* 80CB31FC */ void modeWait(); + /* 80CB32EC */ void init_modeWaitSetEffect(); + /* 80CB3380 */ void modeWaitSetEffect(); + /* 80CB3540 */ void init_modeMoveOut(); + /* 80CB355C */ void modeMoveOut(); + /* 80CB3714 */ void init_modeMove(); + /* 80CB3730 */ void modeMove(); + /* 80CB38EC */ void init_modeMoveWait(); + /* 80CB3918 */ void modeMoveWait(); + /* 80CB3958 */ void modeNoMove(); + /* 80CB39CC */ void init_modeOnFire(); + /* 80CB39E0 */ void modeOnFire(); + /* 80CB3ADC */ void init_modeFireEnd(); + /* 80CB3AE8 */ void modeFireEnd(); + /* 80CB3B70 */ void eventStart(); + /* 80CB3BE0 */ void eventRun(); + /* 80CB3C64 */ bool eventEnd(); + /* 80CB3C6C */ bool Draw(); + /* 80CB3C74 */ void Delete(); + /* 80CB3E58 */ ~daPoFire_c(); +private: + /* 0x568 */ u8 field_0x568[0x618 - 0x568]; +}; +STATIC_ASSERT(sizeof(daPoFire_c) == 0x618); + +class daPoFire_HIO_c { +public: + /* 80CB294C */ daPoFire_HIO_c(); + /* 80CB3D24 */ ~daPoFire_HIO_c(); +}; #endif /* D_A_OBJ_POFIRE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.h b/include/rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.h index ee8d7b3169c..097e32d6c08 100644 --- a/include/rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.h +++ b/include/rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.h @@ -1,6 +1,43 @@ #ifndef D_A_OBJ_POTBOX_H #define D_A_OBJ_POTBOX_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daPoTbox_c + * @brief Poe Treasure Chest + * + * @details + * + */ +class daPoTbox_c : public fopAc_ac_c { +public: + /* 80CB42C8 */ void setBaseMtx(); + /* 80CB43D0 */ void CreateHeap(); + /* 80CB46C4 */ void create(); + /* 80CB499C */ void Execute(f32 (**)[3][4]); + /* 80CB4AA8 */ void init_modeWait(); + /* 80CB4AB4 */ void modeWait(); + /* 80CB4B10 */ void init_modeOpen(); + /* 80CB4BF8 */ void modeOpen(); + /* 80CB4C54 */ void init_modeOpenEnd(); + /* 80CB4C60 */ void modeOpenEnd(); + /* 80CB4C84 */ void init_modeEnd(); + /* 80CB4C90 */ void modeEnd(); + /* 80CB4C94 */ void Draw(); + /* 80CB4E14 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x608 - 0x568]; +}; +STATIC_ASSERT(sizeof(daPoTbox_c) == 0x608); + +class daPoTbox_HIO_c { +public: + /* 80CB424C */ daPoTbox_HIO_c(); + /* 80CB4F14 */ ~daPoTbox_HIO_c(); +}; + #endif /* D_A_OBJ_POTBOX_H */ diff --git a/include/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.h b/include/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.h index 723a4b542e5..62d878205d8 100644 --- a/include/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.h +++ b/include/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.h @@ -3,6 +3,14 @@ #include "d/com/d_com_inf_game.h" +/** + * @ingroup actors-objects + * @class daObjProp_c + * @brief City in the Sky Propeller? + * + * @details + * + */ class daObjProp_c : public fopAc_ac_c, public request_of_phase_process_class { public: /* 80CB51F8 */ daObjProp_c(); @@ -18,8 +26,10 @@ class daObjProp_c : public fopAc_ac_c, public request_of_phase_process_class { u32 getNameArg_0() { return fopAcM_GetParamBit(this, 0, 4); } u32 getArg_0() { return fopAcM_GetParamBit(this, 4, 4); } +private: /* 0x574 */ J3DModel* mpModel; /* 0x578 */ u8 mArg; -}; // Size: 0x57C +}; +STATIC_ASSERT(sizeof(daObjProp_c) == 0x57C); #endif /* D_A_OBJ_PROP_H */ diff --git a/include/rel/d/a/obj/d_a_obj_pumpkin/d_a_obj_pumpkin.h b/include/rel/d/a/obj/d_a_obj_pumpkin/d_a_obj_pumpkin.h index 7cd7708b097..f17f549b98f 100644 --- a/include/rel/d/a/obj/d_a_obj_pumpkin/d_a_obj_pumpkin.h +++ b/include/rel/d/a/obj/d_a_obj_pumpkin/d_a_obj_pumpkin.h @@ -1,5 +1,48 @@ #ifndef D_A_OBJ_PUMPKIN_H #define D_A_OBJ_PUMPKIN_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObj_Pumpkin_c + * @brief Ordon Village Pumpkin + * + * @details + * + */ +class daObj_Pumpkin_c : public fopAc_ac_c { +public: + /* 80CB578C */ ~daObj_Pumpkin_c(); + /* 80CB5A04 */ void create(); + /* 80CB5F88 */ void CreateHeap(); + /* 80CB6018 */ void Delete(); + /* 80CB604C */ void Execute(); + /* 80CB7638 */ void Draw(); + /* 80CB7824 */ void createHeapCallBack(fopAc_ac_c*); + /* 80CB7844 */ void isDelete(); + /* 80CB78C8 */ void setEnvTevColor(); + /* 80CB7924 */ void setRoomNo(); + /* 80CB7968 */ void reset(); + /* 80CB79DC */ void setMtx(); + /* 80CB7AE4 */ void calcRollAngle(s16, int); + /* 80CB7B84 */ void getWallAngle(s16, s16*); + /* 80CB7D14 */ void setSmokePrtcl(); + /* 80CB7D98 */ void setWaterPrtcl(); + /* 80CB7E98 */ void setHamonPrtcl(); + /* 80CB7EF4 */ void crash(); + +private: + /* 0x568 */ u8 field_0x568[0xbbc - 0x568]; +}; +STATIC_ASSERT(sizeof(daObj_Pumpkin_c) == 0xbbc); + +class daObj_Pumpkin_Param_c { +public: + /* 80CB8304 */ ~daObj_Pumpkin_Param_c(); + + static u8 const m[52]; +}; + #endif /* D_A_OBJ_PUMPKIN_H */ diff --git a/include/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.h b/include/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.h index 44f94c45328..3a7a576d67c 100644 --- a/include/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.h +++ b/include/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.h @@ -3,6 +3,14 @@ #include "d/com/d_com_inf_game.h" +/** + * @ingroup actors-objects + * @class daObjRCircle_c + * @brief River Circle + * + * @details + * + */ class daObjRCircle_c : public fopAc_ac_c, public request_of_phase_process_class { public: /* 80CB8678 */ daObjRCircle_c(); @@ -17,10 +25,12 @@ class daObjRCircle_c : public fopAc_ac_c, public request_of_phase_process_class int getSwBit() { return fopAcM_GetParamBit(this, 0, 8) & 0xFF; } +private: /* 0x574 */ mDoExt_brkAnm mBrk; /* 0x58C */ mDoExt_btkAnm mBtk; /* 0x5A4 */ J3DModel* mpModel; /* 0x5A8 */ u8 mSwitch; }; +STATIC_ASSERT(sizeof(daObjRCircle_c) == 0x5AC); #endif /* D_A_OBJ_RCIRCLE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.h b/include/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.h index 527881f5adb..837a6940bf6 100644 --- a/include/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.h +++ b/include/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.h @@ -1,6 +1,47 @@ #ifndef D_A_OBJ_RFHOLE_H #define D_A_OBJ_RFHOLE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daRfHole_c + * @brief (Kakariko?) Roof Hole + * + * @details + * + */ +class daRfHole_c : public fopAc_ac_c { +public: + /* 80CB8F04 */ void setBaseMtx(); + /* 80CB8F8C */ void CreateHeap(); + /* 80CB8FF8 */ void create(); + /* 80CB9148 */ void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*); + /* 80CB9194 */ void playerAreaCheck(); + /* 80CB940C */ void Execute(f32 (**)[3][4]); + /* 80CB9464 */ void holeProc(); + /* 80CB9520 */ void init_modeWait(); + /* 80CB952C */ void modeWait(); + /* 80CB9558 */ void init_modeBreak(); + /* 80CB96AC */ void modeBreak(); + /* 80CB96CC */ void init_modeBreakEff(); + /* 80CB971C */ void modeBreakEff(); + /* 80CB973C */ void init_modeEnd(); + /* 80CB9748 */ void modeEnd(); + /* 80CB9768 */ void setBreakEffect(); + /* 80CB9878 */ void Draw(); + /* 80CB991C */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x5b4 - 0x568]; +}; +STATIC_ASSERT(sizeof(daRfHole_c) == 0x5b4); + +class daRfHole_HIO_c { +public: + /* 80CB8E6C */ daRfHole_HIO_c(); + /* 80CB99D8 */ ~daRfHole_HIO_c(); +}; + #endif /* D_A_OBJ_RFHOLE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.h b/include/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.h index 1c6535e6f3b..930c15a535f 100644 --- a/include/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.h +++ b/include/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.h @@ -5,6 +5,14 @@ #include "d/bg/d_bg_s_movebg_actor.h" #include "d/cc/d_cc_d.h" +/** + * @ingroup actors-objects + * @class daObjRgate_c + * @brief Rider Gate + * + * @details + * + */ class daObjRgate_c : public dBgS_MoveBgActor { public: /* 80CB9DF8 */ void initBaseMtx(); @@ -76,5 +84,6 @@ class daObjRgate_c : public dBgS_MoveBgActor { /* 0xC00 */ Mtx field_0xc00; /* 0xC30 */ Mtx field_0xc30; }; +STATIC_ASSERT(sizeof(daObjRgate_c) == 0xC60); #endif /* D_A_OBJ_RGATE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_riverrock/d_a_obj_riverrock.h b/include/rel/d/a/obj/d_a_obj_riverrock/d_a_obj_riverrock.h index 69675110c98..07cde0c0ee2 100644 --- a/include/rel/d/a/obj/d_a_obj_riverrock/d_a_obj_riverrock.h +++ b/include/rel/d/a/obj/d_a_obj_riverrock/d_a_obj_riverrock.h @@ -1,5 +1,46 @@ #ifndef D_A_OBJ_RIVERROCK_H #define D_A_OBJ_RIVERROCK_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjRIVERROCK_c + * @brief (Zora?) River Rock + * + * @details + * + */ +class daObjRIVERROCK_c : public fopAc_ac_c { +public: + /* 80CBC6F4 */ void initCcCylinder(); + /* 80CBC754 */ void SetCcCyl(); + /* 80CBC7F8 */ void BreakWaitAction(); + /* 80CBC8BC */ void CheckBG(); + /* 80CBCC3C */ void BreakMoveAction(); + /* 80CBCCC0 */ void BrokenAction(); + /* 80CBCD94 */ void BreakAction(); + /* 80CBCDE8 */ void Action(); + /* 80CBCE2C */ void BreakSet(); + /* 80CBD1C4 */ void WaitAction(); + /* 80CBD204 */ void setBaseMtx(); + /* 80CBD348 */ void CreateHeap(); + /* 80CBD3C0 */ void create(); + /* 80CBD7B4 */ void Create(); + /* 80CBD814 */ void Execute(f32 (**)[3][4]); + /* 80CBD8E0 */ void Draw(); + /* 80CBD964 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x79c - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjRIVERROCK_c) == 0x79c); + +class daObjRIVERROCK_HIO_c { +public: + /* 80CBC6CC */ daObjRIVERROCK_HIO_c(); + /* 80CBD9C4 */ ~daObjRIVERROCK_HIO_c(); +}; + #endif /* D_A_OBJ_RIVERROCK_H */ diff --git a/include/rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.h b/include/rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.h index 47e2909b34f..36a2d8be37f 100644 --- a/include/rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.h +++ b/include/rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.h @@ -5,8 +5,6 @@ #include "d/cc/d_cc_d.h" #include "f_op/f_op_actor.h" -class J3DModel; - struct rock_ss { /* 80CBE5A4 */ ~rock_ss(); /* 80CBE678 */ rock_ss(); @@ -22,6 +20,14 @@ struct rock_ss { STATIC_ASSERT(sizeof(rock_ss) == 0x160); +/** + * @ingroup actors-objects + * @class obj_rock_class + * @brief Rock + * + * @details + * + */ class obj_rock_class : public fopAc_ac_c { public: /* 0x568 */ request_of_phase_process_class mPhaseReq; @@ -34,7 +40,7 @@ class obj_rock_class : public fopAc_ac_c { /* 0x1B7C */ dCcD_Stts mStts; /* 0x1BB8 */ u8 field_0x1bb8; // Unused? /* 0x1BB9 */ bool mInitialized; -}; // Size: 0x1BBC +}; STATIC_ASSERT(sizeof(obj_rock_class) == 0x1BBC); diff --git a/include/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.h b/include/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.h index fbe015e46b8..ffe3123edff 100644 --- a/include/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.h +++ b/include/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.h @@ -1,5 +1,46 @@ #ifndef D_A_OBJ_ROPE_BRIDGE_H #define D_A_OBJ_ROPE_BRIDGE_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjRBridge_c + * @brief Small / Big Rope Bridge + * + * @details + * + */ +class daObjRBridge_c : public fopAc_ac_c { +public: + /* 80595E38 */ void initBaseMtx(); + /* 80595ED8 */ void setBaseMtx(); + /* 80595F84 */ void checkE3Special(); + /* 80595FE0 */ void setStPos(); + /* 8059616C */ void initLinePos(); + /* 805963C4 */ void setLinePos(); + /* 80596768 */ void getLinePosSt(cXyz*); + /* 805967E4 */ void getLinePosBrg(int, cXyz*); + /* 8059689C */ void checkTight(); + /* 805969FC */ void Create(); + /* 80596B88 */ void CreateHeap(); + /* 80596DEC */ void create1st(); + /* 80596EBC */ void Execute(f32 (**)[3][4]); + /* 80596FA8 */ void action(); + /* 8059715C */ void init_wait(); + /* 80597170 */ void mode_wait(); + /* 805973BC */ void init_cut(); + /* 805973E4 */ void mode_cut(); + /* 805975E8 */ void init_end(); + /* 805975F4 */ void mode_end(); + /* 805975F8 */ void Draw(); + /* 805977D0 */ void checkHimoCulling(); + /* 805978BC */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0xb6c - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjRBridge_c) == 0xb6c); + #endif /* D_A_OBJ_ROPE_BRIDGE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge.h b/include/rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge.h index 73bf47fe83a..b144e44a7d5 100644 --- a/include/rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge.h +++ b/include/rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge.h @@ -1,6 +1,38 @@ #ifndef D_A_OBJ_ROTBRIDGE_H #define D_A_OBJ_ROTBRIDGE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daRotBridge_c + * @brief Rotating Bridge + * + * @details + * + */ +class daRotBridge_c : public fopAc_ac_c { +public: + /* 80CBEA24 */ void setBaseMtx(); + /* 80CBEB38 */ void CreateHeap(); + /* 80CBECBC */ void create(); + /* 80CBEF1C */ void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*); + /* 80CBEF34 */ void Execute(f32 (**)[3][4]); + /* 80CBF050 */ void playerAreaCheck(); + /* 80CBF1EC */ void moveBridge(); + /* 80CBF404 */ void Draw(); + /* 80CBF4BC */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x610 - 0x568]; +}; +STATIC_ASSERT(sizeof(daRotBridge_c) == 0x610); + +class daRotBridge_HIO_c { +public: + /* 80CBE98C */ daRotBridge_HIO_c(); + /* 80CBF5BC */ ~daRotBridge_HIO_c(); +}; + #endif /* D_A_OBJ_ROTBRIDGE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap.h b/include/rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap.h index 4d225182181..235d4d0089b 100644 --- a/include/rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap.h +++ b/include/rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap.h @@ -1,6 +1,46 @@ #ifndef D_A_OBJ_ROTTRAP_H #define D_A_OBJ_ROTTRAP_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daRotTrap_c + * @brief Rotating Skull Trap + * + * @details + * + */ +class daRotTrap_c : public fopAc_ac_c { +public: + /* 80CBF940 */ void setBaseMtx(); + /* 80CBF9D8 */ void CreateHeap(); + /* 80CBFAC8 */ void create(); + /* 80CBFEC4 */ void Execute(f32 (**)[3][4]); + /* 80CBFF1C */ void procMain(); + /* 80CC00AC */ void init_modeWait(); + /* 80CC0120 */ void modeWait(); + /* 80CC0180 */ void init_modeAcc(); + /* 80CC027C */ void modeAcc(); + /* 80CC034C */ void init_modeMove(); + /* 80CC0360 */ void modeMove(); + /* 80CC0440 */ void seSet(); + /* 80CC0548 */ void Draw(); + /* 80CC05EC */ void Delete(); + + static u8 const mCcDObjInfo[48]; + static u8 mCcDCyl[68]; + +private: + /* 0x568 */ u8 field_0x568[0x173c - 0x568]; +}; +STATIC_ASSERT(sizeof(daRotTrap_c) == 0x173c); + +class daRotTrap_HIO_c { +public: + /* 80CBF8AC */ daRotTrap_HIO_c(); + /* 80CC0728 */ ~daRotTrap_HIO_c(); +}; + #endif /* D_A_OBJ_ROTTRAP_H */ diff --git a/include/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.h b/include/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.h index b1ec30c4163..43c552f0115 100644 --- a/include/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.h +++ b/include/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.h @@ -1,6 +1,33 @@ #ifndef D_A_OBJ_ROTEN_H #define D_A_OBJ_ROTEN_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObj_Roten_c + * @brief Goron Child Stall + * + * @details + * + */ +class daObj_Roten_c : public fopAc_ac_c { +public: + /* 80CC0B58 */ void initBaseMtx(); + /* 80CC0B94 */ void setBaseMtx(); + /* 80CC0C20 */ void Create(); + /* 80CC0EC4 */ void CreateHeap(); + /* 80CC0F40 */ void create(); + /* 80CC1038 */ void Execute(f32 (**)[3][4]); + /* 80CC1138 */ void Draw(); + /* 80CC1254 */ void Delete(); + /* 80CC12E4 */ void getResName(); + /* 80CC1388 */ ~daObj_Roten_c(); + +private: + /* 0x568 */ u8 field_0x568[0x5c8 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObj_Roten_c) == 0x5c8); + #endif /* D_A_OBJ_ROTEN_H */ diff --git a/include/rel/d/a/obj/d_a_obj_rstair/d_a_obj_rstair.h b/include/rel/d/a/obj/d_a_obj_rstair/d_a_obj_rstair.h index 22faeef4b4e..7d5ef5bc2a7 100644 --- a/include/rel/d/a/obj/d_a_obj_rstair/d_a_obj_rstair.h +++ b/include/rel/d/a/obj/d_a_obj_rstair/d_a_obj_rstair.h @@ -1,6 +1,45 @@ #ifndef D_A_OBJ_RSTAIR_H #define D_A_OBJ_RSTAIR_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjRotStair_c + * @brief Rail Staircase + * + * @details + * + */ +class daObjRotStair_c : public fopAc_ac_c { +public: + /* 80CC1558 */ void initBaseMtx(); + /* 80CC1614 */ void setBaseMtx(); + /* 80CC16B0 */ void Create(); + /* 80CC17F0 */ void CreateHeap(); + /* 80CC1A28 */ void create1st(); + /* 80CC1AF0 */ void Execute(f32 (**)[3][4]); + /* 80CC1BA4 */ void move_proc_call(); + /* 80CC1C30 */ void init_modeWait(); + /* 80CC1CF0 */ void modeWait(); + /* 80CC1DF8 */ void init_modeRotate(); + /* 80CC1EC8 */ void modeRotate(); + /* 80CC2024 */ void event_proc_call(); + /* 80CC20E0 */ void actionWait(); + /* 80CC2158 */ void actionOrderEvent(); + /* 80CC21C0 */ void actionEvent(); + /* 80CC221C */ void actionDead(); + /* 80CC2220 */ void checkChangeSw(); + /* 80CC22A0 */ void offSwitch(int); + /* 80CC2310 */ void onWaterModel(); + /* 80CC2364 */ void offWaterModel(); + /* 80CC23C4 */ void Draw(); + /* 80CC25C0 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x5e4 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjRotStair_c) == 0x5e4); + #endif /* D_A_OBJ_RSTAIR_H */ diff --git a/include/rel/d/a/obj/d_a_obj_rw/d_a_obj_rw.h b/include/rel/d/a/obj/d_a_obj_rw/d_a_obj_rw.h index 34b7c01001a..d3d7c5a5e87 100644 --- a/include/rel/d/a/obj/d_a_obj_rw/d_a_obj_rw.h +++ b/include/rel/d/a/obj/d_a_obj_rw/d_a_obj_rw.h @@ -1,5 +1,33 @@ #ifndef D_A_OBJ_RW_H #define D_A_OBJ_RW_H +#include "f_op/f_op_actor_mng.h" +#include "d/cc/d_cc_d.h" + +/** + * @ingroup actors-objects + * @class obj_rw_class + * @brief Wild Boar Roast + * + * @details + * + */ +class obj_rw_class : public fopAc_ac_c { +private: + /* 0x568 */ u8 field_0x568[0xe3c - 0x568]; +}; +STATIC_ASSERT(sizeof(obj_rw_class) == 0xe3c); + +struct daObj { +public: + /* 80037900 */ void HitSeStart(cXyz const*, int, dCcD_GObjInf const*, u32); +}; + +class daOBJ_RW_HIO_c { +public: + /* 80CC298C */ daOBJ_RW_HIO_c(); + /* 80CC3A5C */ ~daOBJ_RW_HIO_c(); +}; + #endif /* D_A_OBJ_RW_H */ diff --git a/include/rel/d/a/obj/d_a_obj_sWallShutter/d_a_obj_sWallShutter.h b/include/rel/d/a/obj/d_a_obj_sWallShutter/d_a_obj_sWallShutter.h index 645e840ccbd..ba8be22c8c4 100644 --- a/include/rel/d/a/obj/d_a_obj_sWallShutter/d_a_obj_sWallShutter.h +++ b/include/rel/d/a/obj/d_a_obj_sWallShutter/d_a_obj_sWallShutter.h @@ -1,6 +1,44 @@ #ifndef D_A_OBJ_SWALLSHUTTER_H #define D_A_OBJ_SWALLSHUTTER_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daSwShutter_c + * @brief Rider Gate + * + * @details + * + */ +class daSwShutter_c : public fopAc_ac_c { +public: + /* 805982A4 */ void setBaseMtx(); + /* 80598344 */ void CreateHeap(); + /* 805983C4 */ void create(); + /* 80598564 */ void Execute(f32 (**)[3][4]); + /* 805985B4 */ void moveMain(); + /* 8059873C */ void init_modeWait(); + /* 80598748 */ void modeWait(); + /* 8059879C */ void init_modeMoveDownInit(); + /* 805989D0 */ void modeMoveDownInit(); + /* 80598A04 */ void init_modeMoveDown(); + /* 80598AFC */ void modeMoveDown(); + /* 80598D4C */ void init_modeMoveDownEnd(); + /* 80598D58 */ void modeMoveDownEnd(); + /* 80598D5C */ void Draw(); + /* 80598E00 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x5e8 - 0x568]; +}; +STATIC_ASSERT(sizeof(daSwShutter_c) == 0x5e8); + +class daSwShutter_HIO_c { +public: + /* 805981EC */ daSwShutter_HIO_c(); + /* 80598ECC */ ~daSwShutter_HIO_c(); +}; + #endif /* D_A_OBJ_SWALLSHUTTER_H */ diff --git a/include/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan.h b/include/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan.h index d326f1673f7..a5547272a6d 100644 --- a/include/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan.h +++ b/include/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan.h @@ -5,6 +5,14 @@ #include "d/bg/d_bg_s_movebg_actor.h" #include "m_Do/m_Do_hostIO.h" +/** + * @ingroup actors-objects + * @class daSaidan_c + * @brief Altar + * + * @details + * + */ class daSaidan_c : public dBgS_MoveBgActor { public: enum Mode_e { @@ -27,12 +35,13 @@ class daSaidan_c : public dBgS_MoveBgActor { /* 80CC4318 */ virtual int Draw(); /* 80CC43BC */ virtual int Delete(); +private: /* 0x5A0 */ request_of_phase_process_class mPhaseReq; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ u8 mMode; /* 0x5AD */ u8 mIsSwitch; /* 0x5B0 */ f32 mOriginalPosX; -}; // Size: 0x5B4 +}; STATIC_ASSERT(sizeof(daSaidan_c) == 0x5B4); diff --git a/include/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita.h b/include/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita.h index b87c5ebeb0a..4d4503ca6bb 100644 --- a/include/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita.h +++ b/include/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita.h @@ -1,6 +1,31 @@ #ifndef D_A_OBJ_SAKUITA_H #define D_A_OBJ_SAKUITA_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjSakuita_c + * @brief Rope Plank + * + * @details + * + */ +class daObjSakuita_c : public fopAc_ac_c { +public: + /* 80CC46F8 */ void create_init(); + /* 80CC47F8 */ void initBaseMtx(); + /* 80CC4818 */ void setBaseMtx(); + /* 80CC489C */ void setPlatePos(); + /* 80CC4A98 */ void calcAngle(); + /* 80CC4C9C */ ~daObjSakuita_c(); + + static u8 const M_attr[44]; + +private: + /* 0x568 */ u8 field_0x568[0x750 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjSakuita_c) == 0x750); + #endif /* D_A_OBJ_SAKUITA_H */ diff --git a/include/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope.h b/include/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope.h index ba00b09144b..3746176d51b 100644 --- a/include/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope.h +++ b/include/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope.h @@ -1,6 +1,50 @@ #ifndef D_A_OBJ_SAKUITA_ROPE_H #define D_A_OBJ_SAKUITA_ROPE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjItaRope_c + * @brief Rope Banner Fence + * + * @details + * + */ +class daObjItaRope_c : public fopAc_ac_c { +public: + /* 80CC57E4 */ void create_init(); + /* 80CC5E48 */ void initBaseMtx(); + /* 80CC5E7C */ void setBaseMtx(); + /* 80CC5ECC */ void setNormalRopePos(); + + static u8 const M_attr[20]; + +private: + /* 0x568 */ u8 field_0x568[0x638 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjItaRope_c) == 0x638); + +class Sakuita_c { +public: + /* 80CC5238 */ void setModelData(J3DModelData*); + /* 80CC527C */ void create(cXyz*, s16, s8); + /* 80CC5314 */ void execute(cXyz*, s16); + /* 80CC5354 */ void draw(); + /* 80CC5390 */ void initBaseMtx(); + /* 80CC53B0 */ void setBaseMtx(); + /* 80CC5444 */ void setPlatePos(cXyz*); + /* 80CC5720 */ void calcAngle(); + /* 80CC63E4 */ ~Sakuita_c(); + /* 80CC6420 */ Sakuita_c(); +}; + +class RopeWork_c { +public: + /* 80CC6424 */ ~RopeWork_c(); + /* 80CC6460 */ RopeWork_c(); +}; + + #endif /* D_A_OBJ_SAKUITA_ROPE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon.h b/include/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon.h index 412b6ad40ac..cae0c3136e1 100644 --- a/include/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon.h +++ b/include/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon.h @@ -1,6 +1,69 @@ #ifndef D_A_OBJ_SCANNON_H #define D_A_OBJ_SCANNON_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daSCannon_c + * @brief Sky Cannon (City in the Sky) + * + * @details + * + */ +class daSCannon_c : public fopAc_ac_c { +public: + /* 80CC6B0C */ daSCannon_c(); + /* 80CC6C10 */ ~daSCannon_c(); + /* 80CC6D10 */ void create(); + /* 80CC7204 */ void execute(); + /* 80CC7228 */ void draw(); + /* 80CC747C */ void Delete(); + /* 80CC7508 */ void setModelMtx(); + /* 80CC7578 */ void setPtlModelMtx(); + /* 80CC7608 */ void createHeap(); + /* 80CC7970 */ void middleExe(); + /* 80CC7A10 */ void orderEvtInit(); + /* 80CC7AB8 */ void exeModeWait(); + /* 80CC7C48 */ void exeModeOrderEvt(); + /* 80CC7D14 */ void exeModeActionEvt(); + /* 80CC7EBC */ void exeModeEnd(); + /* 80CC7EC0 */ void demoExe(); + /* 80CC7FAC */ void demoModeInit(int); + /* 80CC8044 */ void demoInitLinkIn(); + /* 80CC8048 */ void demoExeLinkIn(); + /* 80CC8108 */ void demoInitSet(); + /* 80CC81DC */ void demoExeSet(); + /* 80CC8274 */ void demoInitMove(); + /* 80CC8278 */ void demoExeMove(); + /* 80CC8378 */ void demoInitFire(); + /* 80CC83CC */ void demoExeFire(); + /* 80CC8430 */ void demoInitFinish(); + /* 80CC8538 */ void demoExeFinish(); + /* 80CC8648 */ void demoInitWarpEndWait(); + /* 80CC8714 */ void demoExeWarpEndWait(); + /* 80CC8804 */ void demoInitWarpEndMove(); + /* 80CC8818 */ void demoExeWarpEndMove(); + /* 80CC88A8 */ void changeScene(); + /* 80CC8998 */ void init(); + /* 80CC8A30 */ void initEmtRt(u16, int, u16 const*, JPABaseEmitter**); + /* 80CC8B60 */ void exeEmtRt(u16, int, JPABaseEmitter**); + /* 80CC8BF4 */ void initEmtLine(); + /* 80CC8CDC */ void exeEmtLine(); + /* 80CC8DA0 */ void delEmtAll(); + /* 80CC8DDC */ void setCannonRepair(); + + static void* const s_demoTable[12]; + static u8 s_exeProc[48]; + static u8 s_demoExeProc_WarpEnd[48]; + static u8 s_demoExeProc_FireTks[72]; + static u8 s_demoExeProc_FireFirst[24]; + static u8 s_demoExeProc_FireSecond[96]; + +private: + /* 0x568 */ u8 field_0x568[0x638 - 0x568]; +}; +STATIC_ASSERT(sizeof(daSCannon_c) == 0x638); + #endif /* D_A_OBJ_SCANNON_H */ diff --git a/include/rel/d/a/obj/d_a_obj_scannon_crs/d_a_obj_scannon_crs.h b/include/rel/d/a/obj/d_a_obj_scannon_crs/d_a_obj_scannon_crs.h index ea3f410c746..ce5a46d3cea 100644 --- a/include/rel/d/a/obj/d_a_obj_scannon_crs/d_a_obj_scannon_crs.h +++ b/include/rel/d/a/obj/d_a_obj_scannon_crs/d_a_obj_scannon_crs.h @@ -1,6 +1,45 @@ #ifndef D_A_OBJ_SCANNON_CRS_H #define D_A_OBJ_SCANNON_CRS_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "rel/d/a/d_a_midna/d_a_midna.h" + +/** + * @ingroup actors-objects + * @class daSCannonCrs_c + * @brief Sky Cannon (Broken) + * + * @details + * + */ +class daSCannonCrs_c : public fopAc_ac_c { +public: + /* 80CC973C */ daSCannonCrs_c(); + /* 80CC983C */ ~daSCannonCrs_c(); + /* 80CC9910 */ void create(); + /* 80CC9B10 */ void Delete(); + /* 80CC9B80 */ void draw(); + /* 80CC9C64 */ void execute(); + /* 80CC9CA4 */ void middleExe(daMidna_c*); + /* 80CC9D60 */ void exeModeWait(daMidna_c*); + /* 80CC9F34 */ void exeModePreWait(daMidna_c*); + /* 80CC9F80 */ void exeModeOrderEvt(daMidna_c*); + /* 80CCA240 */ void exeModeTalkEvt(daMidna_c*); + /* 80CCA2CC */ void exeModeWarpEvt(daMidna_c*); + /* 80CCA344 */ void exeModeEnd(daMidna_c*); + /* 80CCA348 */ void demoExe(); + /* 80CCA74C */ void init(); + /* 80CCA848 */ void setModelMtx(); + /* 80CCA8CC */ void createHeap(); + /* 80CCAAC4 */ void chkInTalkRange(); + /* 80CCAB24 */ void initEmtRt(u16, int, u16 const*, JPABaseEmitter**); + /* 80CCAC48 */ void exeEmtRt(u16, int, JPABaseEmitter**); + /* 80CCACD0 */ void callMidnaBeamEmt(); + + static u8 s_exeProc[72]; +private: + /* 0x568 */ u8 field_0x568[0x674 - 0x568]; +}; +STATIC_ASSERT(sizeof(daSCannonCrs_c) == 0x674); #endif /* D_A_OBJ_SCANNON_CRS_H */ diff --git a/include/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten.h b/include/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten.h index 704e322d913..366040d3456 100644 --- a/include/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten.h +++ b/include/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten.h @@ -1,6 +1,60 @@ #ifndef D_A_OBJ_SCANNON_TEN_H #define D_A_OBJ_SCANNON_TEN_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjSCannonTen_c + * @brief Sky Cannon (Lake Hylia, Fixed) + * + * @details + * + */ +class daObjSCannonTen_c : public fopAc_ac_c { +public: + /* 80CCB364 */ daObjSCannonTen_c(); + /* 80CCB43C */ ~daObjSCannonTen_c(); + /* 80CCB4EC */ void createHeap(); + /* 80CCB66C */ void create(); + /* 80CCB9E0 */ void Delete(); + /* 80CCBA58 */ void draw(); + /* 80CCBB6C */ void execute(); + /* 80CCBB90 */ void middleExe(); + /* 80CCBC08 */ void exeModeWait(); + /* 80CCBCB0 */ void exeModeOrderEvt(); + /* 80CCBD4C */ void exeModeActionEvt(); + /* 80CCBDCC */ void exeModeEnd(); + /* 80CCBDD0 */ void demoExe(); + /* 80CCBE8C */ void demoModeInit(int); + /* 80CCBF00 */ void demoInitLinkIn(); + /* 80CCBF04 */ void demoExeLinkIn(); + /* 80CCBFC4 */ void demoInitSet(); + /* 80CCC088 */ void demoExeSet(); + /* 80CCC114 */ void demoInitMove(); + /* 80CCC118 */ void demoExeMove(); + /* 80CCC20C */ void demoInitFire(); + /* 80CCC260 */ void demoExeFire(); + /* 80CCC2B8 */ void demoInitFireEnd(); + /* 80CCC37C */ void demoExeFireEnd(); + /* 80CCC3D4 */ void demoInitFinish(); + /* 80CCC498 */ void demoExeFinish(); + /* 80CCC528 */ void init(); + /* 80CCC53C */ void setModelMtx(); + /* 80CCC5A0 */ void changeScene(); + /* 80CCC628 */ void initEmtSmoke(); + /* 80CCC74C */ void exeEmtSmoke(); + /* 80CCC7D0 */ void initEmtLine(); + /* 80CCC8B8 */ void exeEmtLine(); + /* 80CCC97C */ void delEmtAll(); + + static u8 s_exeProc[48]; + static u8 s_demoExeProc[144]; + +private: + /* 0x568 */ u8 field_0x568[0x604 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjSCannonTen_c) == 0x604); + #endif /* D_A_OBJ_SCANNON_TEN_H */ diff --git a/include/rel/d/a/obj/d_a_obj_sekidoor/d_a_obj_sekidoor.h b/include/rel/d/a/obj/d_a_obj_sekidoor/d_a_obj_sekidoor.h index 240920572bd..15a4784b973 100644 --- a/include/rel/d/a/obj/d_a_obj_sekidoor/d_a_obj_sekidoor.h +++ b/include/rel/d/a/obj/d_a_obj_sekidoor/d_a_obj_sekidoor.h @@ -1,6 +1,40 @@ #ifndef D_A_OBJ_SEKIDOOR_H #define D_A_OBJ_SEKIDOOR_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObj_SekiDoor_c + * @brief Stone Door + * + * @details + * + */ +class daObj_SekiDoor_c : public fopAc_ac_c { +public: + /* 80CCD02C */ void create(); + /* 80CCD154 */ void CreateHeap(); + /* 80CCD1F0 */ void Create(); + /* 80CCD23C */ void Delete(); + /* 80CCD290 */ void Execute(f32 (**)[3][4]); + /* 80CCD538 */ void Draw(); + /* 80CCD5DC */ void evtSkip(); + /* 80CCD64C */ void setPrtcls(); + /* 80CCD810 */ void initBaseMtx(); + /* 80CCD84C */ void setBaseMtx(); + +private: + /* 0x568 */ u8 field_0x568[0x5d8 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObj_SekiDoor_c) == 0x5d8); + +class daObj_SekiDoor_Param_c { +public: + /* 80CCD9AC */ ~daObj_SekiDoor_Param_c(); + + static u8 const m[1 + 3 /* padding */]; +}; + #endif /* D_A_OBJ_SEKIDOOR_H */ diff --git a/include/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.h b/include/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.h index 5b90f27da2a..2d615888986 100644 --- a/include/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.h +++ b/include/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.h @@ -4,6 +4,14 @@ #include "d/bg/d_bg_s_movebg_actor.h" #include "f_op/f_op_actor_mng.h" +/** + * @ingroup actors-objects + * @class daObj_Sekizo_c + * @brief Stone Statue + * + * @details + * + */ class daObj_Sekizo_c : public dBgS_MoveBgActor { public: /* 80CCDC0C */ cPhs__Step create(); @@ -16,15 +24,14 @@ class daObj_Sekizo_c : public dBgS_MoveBgActor { /* 80CCDFA4 */ void initBaseMtx(); /* 80CCDFE0 */ void setBaseMtx(); +private: /* 0x5A0 */ u32 field_0x5a0; - /* 0x5A4 */ request_of_phase_process_class mPhaseReq; - /* 0x5AC */ J3DModel* mpModel; /* 0x5B0 */ u8 field_0x5b0; /* 0x5B1 */ bool field_0x5b1; /* 0x5B2 */ bool field_0x5b2; -}; // Size: 0x5B4 +}; STATIC_ASSERT(sizeof(daObj_Sekizo_c) == 0x5B4); diff --git a/include/rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.h b/include/rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.h index 616fb2271ac..c817c85b1e6 100644 --- a/include/rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.h +++ b/include/rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.h @@ -3,6 +3,14 @@ #include "d/a/d_a_npc.h" +/** + * @ingroup actors-objects + * @class daObj_Sekizoa_c + * @brief Stone Guardian Statue(s) + * + * @details + * + */ class daObj_Sekizoa_c : public daNpcT_c { public: /* 80CCE34C */ ~daObj_Sekizoa_c(); diff --git a/include/rel/d/a/obj/d_a_obj_shield/d_a_obj_shield.h b/include/rel/d/a/obj/d_a_obj_shield/d_a_obj_shield.h index 68bdcaf901d..91d4b256487 100644 --- a/include/rel/d/a/obj/d_a_obj_shield/d_a_obj_shield.h +++ b/include/rel/d/a/obj/d_a_obj_shield/d_a_obj_shield.h @@ -1,5 +1,44 @@ #ifndef D_A_OBJ_SHIELD_H #define D_A_OBJ_SHIELD_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daItemShield_c + * @brief Ordon Shield + * + * @details + * + */ +class daItemShield_c : public fopAc_ac_c { +public: + /* 80CD6D9C */ void initBaseMtx(); + /* 80CD6DD8 */ void setBaseMtx(); + /* 80CD7094 */ void Create(); + /* 80CD724C */ bool __CreateHeap(); + /* 80CD7254 */ void create(); + /* 80CD75EC */ void bg_check(); + /* 80CD7734 */ void action_proc_call(); + /* 80CD77F0 */ void actionInit(); + /* 80CD7828 */ void actionWaitInit(); + /* 80CD7890 */ void actionWait(); + /* 80CD7C68 */ void initActionOrderGetDemo(); + /* 80CD7D04 */ void actionOrderGetDemo(); + /* 80CD7D80 */ void actionGetDemo(); + /* 80CD7E00 */ void event_proc_call(); + /* 80CD7EBC */ void actionWaitCamDemo(); + /* 80CD7F20 */ void actionOrderCamDemo(); + /* 80CD7F88 */ void actionCamDemo(); + /* 80CD7FE4 */ void actionCamDemoEnd(); + /* 80CD7FE8 */ void execute(); + /* 80CD80EC */ void draw(); + /* 80CD8140 */ void _delete(); + +private: + /* 0x568 */ u8 field_0x568[0x958 - 0x568]; +}; +STATIC_ASSERT(sizeof(daItemShield_c) == 0x958); + #endif /* D_A_OBJ_SHIELD_H */ diff --git a/include/rel/d/a/obj/d_a_obj_sm_door/d_a_obj_sm_door.h b/include/rel/d/a/obj/d_a_obj_sm_door/d_a_obj_sm_door.h index dedbd23bd7f..c005bef8d08 100644 --- a/include/rel/d/a/obj/d_a_obj_sm_door/d_a_obj_sm_door.h +++ b/include/rel/d/a/obj/d_a_obj_sm_door/d_a_obj_sm_door.h @@ -1,6 +1,36 @@ #ifndef D_A_OBJ_SM_DOOR_H #define D_A_OBJ_SM_DOOR_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjSM_DOOR_c + * @brief Sacred Meadow Door + * + * @details + * + */ +class daObjSM_DOOR_c : public fopAc_ac_c { +public: + /* 80CD8784 */ void ChangeModel(); + /* 80CD8790 */ void Action(); + /* 80CD8A40 */ void SetDzb(); + /* 80CD8A90 */ void ReleaceDzb(); + /* 80CD8AF8 */ void DrawChk1(); + /* 80CD8BBC */ void DrawChk2(); + /* 80CD8C80 */ void setBaseMtx(); + /* 80CD8D4C */ void create(); + /* 80CD90A4 */ void CreateHeap(); + /* 80CD9258 */ void Create(); + /* 80CD929C */ void Execute(f32 (**)[3][4]); + /* 80CD930C */ void Draw(); + /* 80CD9544 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x858 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjSM_DOOR_c) == 0x858); + #endif /* D_A_OBJ_SM_DOOR_H */ diff --git a/include/rel/d/a/obj/d_a_obj_smallkey/d_a_obj_smallkey.h b/include/rel/d/a/obj/d_a_obj_smallkey/d_a_obj_smallkey.h index 0cc5c0d1526..10659ca0429 100644 --- a/include/rel/d/a/obj/d_a_obj_smallkey/d_a_obj_smallkey.h +++ b/include/rel/d/a/obj/d_a_obj_smallkey/d_a_obj_smallkey.h @@ -3,6 +3,14 @@ #include "f_op/f_op_actor_mng.h" +/** + * @ingroup actors-objects + * @class daKey_c + * @brief Small Key + * + * @details + * + */ class daKey_c : public fopAc_ac_c { /* 80CD9F2C */ void initBaseMtx(); /* 80CD9F68 */ void setBaseMtx(); diff --git a/include/rel/d/a/obj/d_a_obj_smgdoor/d_a_obj_smgdoor.h b/include/rel/d/a/obj/d_a_obj_smgdoor/d_a_obj_smgdoor.h index b9f9499303c..ec693e651bb 100644 --- a/include/rel/d/a/obj/d_a_obj_smgdoor/d_a_obj_smgdoor.h +++ b/include/rel/d/a/obj/d_a_obj_smgdoor/d_a_obj_smgdoor.h @@ -1,6 +1,44 @@ #ifndef D_A_OBJ_SMGDOOR_H #define D_A_OBJ_SMGDOOR_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjSmgDoor_c + * @brief Sacred Meadow Grove Door + * + * @details + * + */ +class daObjSmgDoor_c : public fopAc_ac_c { +public: + /* 80CDBB5C */ void initBaseMtx(); + /* 80CDBBEC */ void setBaseMtx(); + /* 80CDBD38 */ void Create(); + /* 80CDBE1C */ void CreateHeap(); + /* 80CDBED4 */ void create1st(); + /* 80CDBFA4 */ void Execute(f32 (**)[3][4]); + /* 80CDBFF0 */ void getDemoAction(); + /* 80CDC038 */ void demoProc(); + /* 80CDC248 */ void openInit(); + /* 80CDC378 */ void openProc(); + /* 80CDC4AC */ void setGoal(); + /* 80CDC548 */ void setPos(); + /* 80CDC610 */ void sceneChange(); + /* 80CDC65C */ void event_proc_call(); + /* 80CDC700 */ void actionWaitEvent(); + /* 80CDC790 */ void actionEvent(); + /* 80CDC7F4 */ void actionDead(); + /* 80CDC7F8 */ void checkArea(); + /* 80CDC974 */ void checkOpen(); + /* 80CDCA00 */ void Draw(); + /* 80CDCAC4 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x5f4 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjSmgDoor_c) == 0x5f4); + #endif /* D_A_OBJ_SMGDOOR_H */ diff --git a/include/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.h b/include/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.h index a7446ef6f24..47ad2800973 100644 --- a/include/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.h +++ b/include/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.h @@ -3,6 +3,14 @@ #include "d/com/d_com_inf_game.h" +/** + * @ingroup actors-objects + * @class daObjSmoke_c + * @brief Elde Inn Stove Smoke + * + * @details + * + */ class daObjSmoke_c : public fopAc_ac_c { public: u8 getSwbit() { @@ -16,7 +24,9 @@ class daObjSmoke_c : public fopAc_ac_c { /* 80CDD004 */ int execute(); /* 80CDD0B8 */ int _delete(); +private: /* 0x568 */ JPABaseEmitter* mParticle; }; +STATIC_ASSERT(sizeof(daObjSmoke_c) == 0x56C); #endif /* D_A_OBJ_SMOKE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.h b/include/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.h index 7a2669d38d9..5db6fac21bf 100644 --- a/include/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.h +++ b/include/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.h @@ -1,6 +1,41 @@ #ifndef D_A_OBJ_SMTILE_H #define D_A_OBJ_SMTILE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObj_SMTile_c + * @brief Sacred Meadow Tile + * + * @details + * + */ +class daObj_SMTile_c : public fopAc_ac_c { +public: + /* 80CDD2AC */ ~daObj_SMTile_c(); + /* 80CDD3E8 */ void create(); + /* 80CDD5CC */ void CreateHeap(); + /* 80CDD6E8 */ void Delete(); + /* 80CDD71C */ void Execute(); + /* 80CDDA98 */ void Draw(); + /* 80CDDB28 */ void createHeapCallBack(fopAc_ac_c*); + /* 80CDDB48 */ void setDstPos(); + /* 80CDDD28 */ void setPrtcls(int, int); + /* 80CDDEFC */ void touchPrtcls(f32); + /* 80CDE1A8 */ void setMtx(); + +private: + /* 0x568 */ u8 field_0x568[0xb30 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObj_SMTile_c) == 0xb30); + +class daObj_SMTile_Param_c { +public: + /* 80CDE300 */ ~daObj_SMTile_Param_c(); + + static u8 const m[8]; +}; + #endif /* D_A_OBJ_SMTILE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_smw_stone/d_a_obj_smw_stone.h b/include/rel/d/a/obj/d_a_obj_smw_stone/d_a_obj_smw_stone.h index 164426b4624..cc095333f02 100644 --- a/include/rel/d/a/obj/d_a_obj_smw_stone/d_a_obj_smw_stone.h +++ b/include/rel/d/a/obj/d_a_obj_smw_stone/d_a_obj_smw_stone.h @@ -1,7 +1,16 @@ #ifndef D_A_OBJ_SMW_STONE_H #define D_A_OBJ_SMW_STONE_H +#include "f_op/f_op_actor_mng.h" +/** + * @ingroup actors-objects + * @class daSmWStone_c + * @brief Howling Stone + * + * @details + * + */ class daSmWStone_c : public fopAc_ac_c { public: /* 80CDE538 */ daSmWStone_c(); @@ -17,6 +26,10 @@ class daSmWStone_c : public fopAc_ac_c { /* 80CDED9C */ void chkWlfInRange(); int getTuneId() { return 2; } + +private: + /* 0x568 */ u8 field_0x568[0x5c8 - 0x568]; }; +STATIC_ASSERT(sizeof(daSmWStone_c) == 0x5c8); #endif /* D_A_OBJ_SMW_STONE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.h b/include/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.h index 532a37b465b..99bcdc76485 100644 --- a/include/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.h +++ b/include/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.h @@ -4,6 +4,14 @@ #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_hostIO.h" +/** + * @ingroup actors-objects + * @class daSnowEffTag_c + * @brief Snow Effect Tag + * + * @details + * + */ class daSnowEffTag_c : public fopAc_ac_c { public: /* 80CDF12C */ void setBaseMtx(); @@ -15,6 +23,7 @@ class daSnowEffTag_c : public fopAc_ac_c { int getArg0() { return fopAcM_GetParamBit(this, 0, 8); } +private: /* 0x568 */ u8 field_0x568; /* 0x569 */ bool mPlayedSound; /* 0x56C */ f32 mMaxSize; @@ -22,6 +31,7 @@ class daSnowEffTag_c : public fopAc_ac_c { /* 0x574 */ f32 field_0x574; /* 0x578 */ u32 mEmitterID; }; +STATIC_ASSERT(sizeof(daSnowEffTag_c) == 0x57C); class daSnowEffTag_HIO_c : public mDoHIO_entry_c { public: diff --git a/include/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.h b/include/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.h index c7244998829..3def55736bd 100644 --- a/include/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.h +++ b/include/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.h @@ -4,6 +4,14 @@ #include "SSystem/SComponent/c_phase.h" #include "f_op/f_op_actor.h" +/** + * @ingroup actors-objects + * @class daObjSnowSoup_c + * @brief Snowpeak Ruins Soup Pot? + * + * @details + * + */ class daObjSnowSoup_c : public fopAc_ac_c, public request_of_phase_process_class { public: /* 80CDF878 */ daObjSnowSoup_c(); @@ -20,6 +28,7 @@ class daObjSnowSoup_c : public fopAc_ac_c, public request_of_phase_process_class /* 80CE003C */ void createSmkEmtChange(int); /* 80CE0134 */ void deleteSmkEmtChange(int); +private: /* 0x574 */ cXyz mFirewoodPos; /* 0x580 */ cXyz mBubblePos; /* 0x58C */ JPABaseEmitter* mpSmkEmtCommon[4]; diff --git a/include/rel/d/a/obj/d_a_obj_so/d_a_obj_so.h b/include/rel/d/a/obj/d_a_obj_so/d_a_obj_so.h index a93ee2b9f60..15f62ceb6fa 100644 --- a/include/rel/d/a/obj/d_a_obj_so/d_a_obj_so.h +++ b/include/rel/d/a/obj/d_a_obj_so/d_a_obj_so.h @@ -1,5 +1,27 @@ #ifndef D_A_OBJ_SO_H #define D_A_OBJ_SO_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class obj_so_class + * @brief Monkey Cage + * + * @details + * + */ +class obj_so_class : public fopAc_ac_c { +private: + /* 0x568 */ u8 field_0x568[0x1bd0 - 0x568]; +}; +STATIC_ASSERT(sizeof(obj_so_class) == 0x1bd0); + +class daObj_So_HIO_c { +public: + /* 80CE03CC */ daObj_So_HIO_c(); + /* 80CE3928 */ ~daObj_So_HIO_c(); +}; + #endif /* D_A_OBJ_SO_H */ diff --git a/include/rel/d/a/obj/d_a_obj_spinLift/d_a_obj_spinLift.h b/include/rel/d/a/obj/d_a_obj_spinLift/d_a_obj_spinLift.h index abb5b3f8af0..37557c38590 100644 --- a/include/rel/d/a/obj/d_a_obj_spinLift/d_a_obj_spinLift.h +++ b/include/rel/d/a/obj/d_a_obj_spinLift/d_a_obj_spinLift.h @@ -1,6 +1,44 @@ #ifndef D_A_OBJ_SPINLIFT_H #define D_A_OBJ_SPINLIFT_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daSpinLift_c + * @brief Spinner Lift + * + * @details + * + */ +class daSpinLift_c : public fopAc_ac_c { +public: + /* 80CE3E2C */ void setBaseMtx(); + /* 80CE3E9C */ void CreateHeap(); + /* 80CE3F1C */ void create(); + /* 80CE40FC */ void Execute(f32 (**)[3][4]); + /* 80CE414C */ void moveLift(); + /* 80CE4290 */ void init_modeWait(); + /* 80CE429C */ void modeWait(); + /* 80CE42A0 */ void init_modeUpMove(); + /* 80CE42C4 */ void modeUpMove(); + /* 80CE468C */ void init_modeDownMove(); + /* 80CE4698 */ void modeDownMove(); + /* 80CE4790 */ void init_modeMoveEnd(); + /* 80CE4A9C */ void modeMoveEnd(); + /* 80CE4AA0 */ void Draw(); + /* 80CE4B44 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x5c0 - 0x568]; +}; +STATIC_ASSERT(sizeof(daSpinLift_c) == 0x5c0); + +class daSpinLift_HIO_c { +public: + /* 80CE3DAC */ daSpinLift_HIO_c(); + /* 80CE4C10 */ ~daSpinLift_HIO_c(); +}; + #endif /* D_A_OBJ_SPINLIFT_H */ diff --git a/include/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink.h b/include/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink.h index 9c463ea8f96..d2910506672 100644 --- a/include/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink.h +++ b/include/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink.h @@ -1,6 +1,56 @@ #ifndef D_A_OBJ_SS_DRINK_H #define D_A_OBJ_SS_DRINK_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObj_SSDrink_c + * @brief ??? + * + * @details + * + */ +class daObj_SSDrink_c : public fopAc_ac_c { +public: + /* 80CE4F78 */ ~daObj_SSDrink_c(); + /* 80CE51C8 */ void create(); + /* 80CE53EC */ void CreateHeap(); + /* 80CE55F0 */ void Delete(); + /* 80CE5624 */ void Execute(); + /* 80CE5858 */ void Draw(); + /* 80CE59DC */ void createHeapCallBack(fopAc_ac_c*); + /* 80CE59FC */ void setSoldOut(); + /* 80CE5A50 */ void getResName(); + /* 80CE5A60 */ void getTypeFromParam(); + /* 80CE5B0C */ void getSwitchFromParam(); + /* 80CE5B18 */ void getCapacityFromParam(); + /* 80CE5B3C */ void getFlowNodeNum(); + /* 80CE5B74 */ void getValue(); + /* 80CE5B80 */ void restart(); + /* 80CE5BF0 */ void initialize(); + /* 80CE5DB0 */ void checkProcess(int (daObj_SSDrink_c::*)(void*)); + /* 80CE5DDC */ void setProcess(int (daObj_SSDrink_c::*)(void*)); + /* 80CE5EC8 */ void setParam(); + /* 80CE5FE4 */ void setEnvTevColor(); + /* 80CE6040 */ void setRoomNo(); + /* 80CE6084 */ void setMtx(); + /* 80CE60E8 */ void setAttnPos(); + /* 80CE6170 */ void animeEntry(); + /* 80CE61E4 */ void animePlay(); + /* 80CE622C */ void chkEvent(); + /* 80CE63AC */ void orderEvent(); + /* 80CE644C */ bool wait(void*); + /* 80CE6454 */ void talk(void*); + /* 80CE6514 */ void drink(void*); + + static u8 const mCcDObjInfo[48]; + static u8 mCcDCyl[68]; + +private: + /* 0x568 */ u8 field_0x568[0xb10 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObj_SSDrink_c) == 0xb10); + #endif /* D_A_OBJ_SS_DRINK_H */ diff --git a/include/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.h b/include/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.h index 70672805e06..aa4975995d8 100644 --- a/include/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.h +++ b/include/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.h @@ -10,6 +10,14 @@ class daObj_SSItem_c; typedef int (daObj_SSItem_c::*ProcessFunc)(void*); +/** + * @ingroup actors-objects + * @class daObj_SSItem_c + * @brief ??? + * + * @details + * + */ class daObj_SSItem_c : public daObj_SSBase_c { public: /* 80CE6C18 */ ~daObj_SSItem_c(); @@ -39,6 +47,7 @@ class daObj_SSItem_c : public daObj_SSBase_c { static dCcD_SrcGObjInf const mCcDObjInfo; static dCcD_SrcCyl mCcDCyl; +private: /* 0x578 */ request_of_phase_process_class mPhase; /* 0x580 */ J3DModel* mpModel; /* 0x584 */ dBgS_ObjAcch mAcch; diff --git a/include/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock.h b/include/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock.h index 9cea3f36821..d69deb8d280 100644 --- a/include/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock.h +++ b/include/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock.h @@ -1,6 +1,39 @@ #ifndef D_A_OBJ_STAIRBLOCK_H #define D_A_OBJ_STAIRBLOCK_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daStairBlock_c + * @brief Stair Block + * + * @details + * + */ +class daStairBlock_c : public fopAc_ac_c { +public: + /* 80CE81F4 */ void setBaseMtx(); + /* 80CE82A0 */ void CreateHeap(); + /* 80CE83F0 */ void create(); + /* 80CE8874 */ void createHeapCallBack(fopAc_ac_c*); + /* 80CE88A0 */ void Execute(); + /* 80CE8B24 */ void Draw(); + /* 80CE8C08 */ void Delete(); + + static u8 const mCcDObjInfo[48]; + static u8 mCcDSph[64]; + +private: + /* 0x568 */ u8 field_0x568[0x132c - 0x568]; +}; +STATIC_ASSERT(sizeof(daStairBlock_c) == 0x132c); + +class daStairBlock_HIO_c { +public: + /* 80CE816C */ daStairBlock_HIO_c(); + /* 80CE8CDC */ ~daStairBlock_HIO_c(); +}; + #endif /* D_A_OBJ_STAIRBLOCK_H */ diff --git a/include/rel/d/a/obj/d_a_obj_stick/d_a_obj_stick.h b/include/rel/d/a/obj/d_a_obj_stick/d_a_obj_stick.h index 30399664cc3..da91a64e7a7 100644 --- a/include/rel/d/a/obj/d_a_obj_stick/d_a_obj_stick.h +++ b/include/rel/d/a/obj/d_a_obj_stick/d_a_obj_stick.h @@ -1,6 +1,44 @@ #ifndef D_A_OBJ_STICK_H #define D_A_OBJ_STICK_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObj_Stick_c + * @brief Stick + * + * @details + * + */ +class daObj_Stick_c : public fopAc_ac_c { +public: + /* 8059922C */ ~daObj_Stick_c(); + /* 805993E8 */ void create(); + /* 80599888 */ void CreateHeap(); + /* 80599900 */ void Delete(); + /* 80599934 */ void Execute(); + /* 80599A78 */ void Draw(); + /* 80599B3C */ void createHeapCallBack(fopAc_ac_c*); + /* 80599B5C */ void getResName(); + /* 80599B6C */ void isDelete(); + /* 80599B8C */ void setEnvTevColor(); + /* 80599BE8 */ void setRoomNo(); + /* 80599C28 */ void setMtx(); + + static u8 mCcDSph[64]; + +private: + /* 0x568 */ u8 field_0x568[0x950 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObj_Stick_c) == 0x950); + +class daObj_Stick_Param_c { +public: + /* 80599DD0 */ ~daObj_Stick_Param_c(); + + static u8 const m[16]; +}; + #endif /* D_A_OBJ_STICK_H */ diff --git a/include/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.h b/include/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.h index 53ce241f864..e296da87d74 100644 --- a/include/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.h +++ b/include/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.h @@ -8,6 +8,14 @@ enum { OBJ_STONE_TYPE_BIG = 1 }; +/** + * @ingroup actors-objects + * @class daObjStone_c + * @brief Small / Large Stones + * + * @details + * + */ class daObjStone_c : public fopAc_ac_c { public: u8 getType() { return fopAcM_GetParamBit(this,0,4); } @@ -46,6 +54,7 @@ class daObjStone_c : public fopAc_ac_c { /* 80CEC888 */ int draw(); /* 80CEC948 */ int _delete(); +private: /* 0x0568 */ request_of_phase_process_class mPhase; /* 0x0570 */ J3DModel* mpModel; /* 0x0574 */ dBgS_ObjAcch mChkObj; @@ -75,5 +84,6 @@ class daObjStone_c : public fopAc_ac_c { /* 0x0964 */ JPABaseEmitter* field_0x0964[3]; /* 0x0970 */ Z2SoundObjSimple mSound; }; +STATIC_ASSERT(sizeof(daObjStone_c) == 0x990); #endif /* D_A_OBJ_STONE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.h b/include/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.h index 76f7a508f55..3ce1859355f 100644 --- a/include/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.h +++ b/include/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.h @@ -6,6 +6,14 @@ #include "d/bg/d_bg_s_acch.h" #include "d/cc/d_cc_d.h" +/** + * @ingroup actors-objects + * @class daObjSMark_c + * @brief Stone Mark + * + * @details + * + */ class daObjSMark_c : public fopAc_ac_c { public: /* 8059A018 */ void initBaseMtx(); @@ -15,6 +23,7 @@ class daObjSMark_c : public fopAc_ac_c { /* 8059A2CC */ int draw(); /* 8059A33C */ int _delete(); +private: /* 0x0568 */ request_of_phase_process_class mpPhase; /* 0x0570 */ GXTexObj mTexObj; /* 0x0590 */ dBgS_ObjAcch mObjAcch; @@ -22,5 +31,6 @@ class daObjSMark_c : public fopAc_ac_c { /* 0x07A8 */ dCcD_Stts mStts; /* 0x07E4 */ Mtx cullMtx; }; +STATIC_ASSERT(sizeof(daObjSMark_c) == 0x0814); #endif /* D_A_OBJ_STONEMARK_H */ diff --git a/include/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.h b/include/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.h index 27ac093f647..d9a75b7d042 100644 --- a/include/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.h +++ b/include/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.h @@ -4,7 +4,16 @@ #include "dolphin/types.h" #include "f_op/f_op_actor.h" -struct daObjStopper_c : public fopAc_ac_c { +/** + * @ingroup actors-objects + * @class daObjStopper_c + * @brief Stopper + * + * @details + * + */ +class daObjStopper_c : public fopAc_ac_c { +public: enum ActionType { ACTION_WAIT, ACTION_WAIT_ORDER_EVENT, @@ -41,8 +50,11 @@ struct daObjStopper_c : public fopAc_ac_c { void setAction(u8 action) { mAction = action; } void startClose() { setAction(ACTION_CLOSE_INIT); } +private: /* 0x568 */ u8 field_0x568[0x93c - 0x568]; /* 0x93C */ u8 mAction; + /* 0x93D */ u8 field_0x93d[0xa00 - 0x93d]; }; +STATIC_ASSERT(sizeof(daObjStopper_c) == 0xA00); #endif /* D_A_OBJ_STOPPER_H */ diff --git a/include/rel/d/a/obj/d_a_obj_stopper2/d_a_obj_stopper2.h b/include/rel/d/a/obj/d_a_obj_stopper2/d_a_obj_stopper2.h index aed0bc394c7..7894f46814f 100644 --- a/include/rel/d/a/obj/d_a_obj_stopper2/d_a_obj_stopper2.h +++ b/include/rel/d/a/obj/d_a_obj_stopper2/d_a_obj_stopper2.h @@ -2,5 +2,52 @@ #define D_A_OBJ_STOPPER2_H #include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjStopper2_c + * @brief Door Stop + * + * @details + * + */ +class daObjStopper2_c : public fopAc_ac_c { +public: + /* 80CEF368 */ J3DModelData* getStopModelData(); + /* 80CEF38C */ void initBaseMtx(); + /* 80CEF3C8 */ void setBaseMtx(); + /* 80CEF434 */ float getMaxOffsetY(); + /* 80CEF44C */ int Create(); + /* 80CEF57C */ int CreateHeap(); + /* 80CEF5C8 */ int create(); + /* 80CEF66C */ int execute(); + /* 80CEF6A4 */ void event_proc_call(); + /* 80CEF760 */ void actionWait(); + /* 80CEF98C */ void actionOrderEvent(); + /* 80CEFA60 */ void actionEvent(); + /* 80CEFAD4 */ void actionDead(); + /* 80CEFAD8 */ void demoProc(); + /* 80CEFD40 */ int draw(); + /* 80CEFDB8 */ int _delete(); + + u32 getEvId() { return fopAcM_GetParamBit(this, 8, 8); } + u32 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); } + void setAction(u8 i_action) { mAction = i_action; } + +private: + /* 0x568 */ request_of_phase_process_class mPhaseReq; + /* 0x570 */ J3DModel* mpModel; + /* 0x574 */ f32 field_0x574; + /* 0x578 */ s32 field_0x578; + /* 0x57C */ u16 field_0x57c[4]; + /* 0x584 */ u8 field_0x584; + /* 0x585 */ u8 field_0x585; + /* 0x586 */ u8 mAction; + /* 0x587 */ u8 field_0x587; + /* 0x588 */ u8 field_0x588; +}; +STATIC_ASSERT(sizeof(daObjStopper2_c) == 0x58C); + #endif /* D_A_OBJ_STOPPER2_H */ diff --git a/include/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.h b/include/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.h index 479d3aca664..5848d30548d 100644 --- a/include/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.h +++ b/include/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.h @@ -4,6 +4,14 @@ #include "f_op/f_op_actor_mng.h" #include "d/bg/d_bg_s_acch.h" +/** + * @ingroup actors-objects + * @class daObj_Suisya_c + * @brief Water Wheel + * + * @details + * + */ class daObj_Suisya_c : public fopAc_ac_c { public: /* 80CF0078 */ int draw(); @@ -12,11 +20,13 @@ class daObj_Suisya_c : public fopAc_ac_c { /* 80CF0284 */ int CreateHeap(); /* 80CF0310 */ int create(); +private: /* 0x568 */ request_of_phase_process_class mPhase; /* 0x570 */ J3DModel* mpModel; /* 0x574 */ u32 mShadowKey; /* 0x578 */ dBgS_AcchCir mAcchCir; /* 0x5B8 */ dBgS_ObjAcch mAcch; }; +STATIC_ASSERT(sizeof(daObj_Suisya_c) == 0x790); #endif /* D_A_OBJ_SUISYA_H */ diff --git a/include/rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.h b/include/rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.h index 887c3d1ab56..7f4d7a77e94 100644 --- a/include/rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.h +++ b/include/rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.h @@ -1,5 +1,27 @@ #ifndef D_A_OBJ_SW_H #define D_A_OBJ_SW_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class obj_sw_class + * @brief Switch + * + * @details + * + */ +class obj_sw_class : public fopAc_ac_c { +private: + /* 0x568 */ u8 field_0x568[0xd90 - 0x568]; +}; +STATIC_ASSERT(sizeof(obj_sw_class) == 0xd90); + +struct obj_sc_s { +public: + /* 80CF2F3C */ ~obj_sc_s(); + /* 80CF2FA8 */ obj_sc_s(); +}; + #endif /* D_A_OBJ_SW_H */ diff --git a/include/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.h b/include/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.h index d0821337f6b..b0d25e654ff 100644 --- a/include/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.h +++ b/include/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.h @@ -4,6 +4,14 @@ #include "f_op/f_op_actor_mng.h" // dEvLib_callback_c is not generated at the correct location. +/** + * @ingroup actors-objects + * @class daObjSwBallA_c + * @brief Ball Switch A + * + * @details + * + */ class daObjSwBallA_c : public fopAc_ac_c /*, public dEvLib_callback_c*/ { public: //daObjSwBallA_c() : dEvLib_callback_c(this) {} @@ -31,6 +39,7 @@ class daObjSwBallA_c : public fopAc_ac_c /*, public dEvLib_callback_c*/ { void onFlag(u8 idx, u8 val) { field_0x5af[idx] |= val; } u8 checkFlag(u8 idx, u8 val) { return field_0x5af[idx] & val; } +private: u8 dEvLib_callback_c_filler[0x14]; /* 0x57C */ request_of_phase_process_class field_0x57c; /* 0x584 */ J3DModel* mModel; @@ -47,5 +56,6 @@ class daObjSwBallA_c : public fopAc_ac_c /*, public dEvLib_callback_c*/ { /* 0x5C6 */ u16 field_0x5c6; /* 0x5C8 */ u16 field_0x5c8; }; +STATIC_ASSERT(sizeof(daObjSwBallA_c) == 0x5CC); #endif /* D_A_OBJ_SWBALLA_H */ diff --git a/include/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.h b/include/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.h index 6a77dc43af6..e49709b8e0d 100644 --- a/include/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.h +++ b/include/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.h @@ -3,6 +3,14 @@ #include "f_op/f_op_actor_mng.h" +/** + * @ingroup actors-objects + * @class daObjSwBallB_c + * @brief Ball Switch B + * + * @details + * + */ class daObjSwBallB_c : public fopAc_ac_c { //, public dEvLib_callback_c { public: //daObjSwBallB_c() : dEvLib_callback_c(this) {} @@ -33,6 +41,7 @@ class daObjSwBallB_c : public fopAc_ac_c { //, public dEvLib_callback_c { void setLightOn() { field_0x5ac = 1; } void setLightOff() { field_0x5ad = 1; } +private: u8 dEvLib_callback_c_filler[0x14]; /* 0x57C */ request_of_phase_process_class field_0x57c; /* 0x584 */ J3DModel* mModel; @@ -53,5 +62,6 @@ class daObjSwBallB_c : public fopAc_ac_c { //, public dEvLib_callback_c { /* 0x5AC */ u8 field_0x5ac; /* 0x5AD */ u8 field_0x5ad; }; +STATIC_ASSERT(sizeof(daObjSwBallB_c) == 0x5B0); #endif /* D_A_OBJ_SWBALLB_H */ diff --git a/include/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.h b/include/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.h index d843e70cd82..63bd1e32fbb 100644 --- a/include/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.h +++ b/include/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.h @@ -3,7 +3,16 @@ #include "f_op/f_op_actor_mng.h" -struct daObjSwBallC_c : public fopAc_ac_c { +/** + * @ingroup actors-objects + * @class daObjSwBallC_c + * @brief Ball Switch C + * + * @details + * + */ +class daObjSwBallC_c : public fopAc_ac_c { +public: /* 80CF5CD4 */ void initBaseMtx(); /* 80CF5CF4 */ void setBaseMtx(); /* 80CF5D58 */ int Create(); @@ -44,5 +53,6 @@ struct daObjSwBallC_c : public fopAc_ac_c { /* 0x587 */ u8 field_0x587; /* 0x588 */ u32 field_0x588; }; +STATIC_ASSERT(sizeof(daObjSwBallC_c) == 0x58C); #endif /* D_A_OBJ_SWBALLC_H */ diff --git a/include/rel/d/a/obj/d_a_obj_swLight/d_a_obj_swLight.h b/include/rel/d/a/obj/d_a_obj_swLight/d_a_obj_swLight.h index ee1c984a995..fcbce7a8306 100644 --- a/include/rel/d/a/obj/d_a_obj_swLight/d_a_obj_swLight.h +++ b/include/rel/d/a/obj/d_a_obj_swLight/d_a_obj_swLight.h @@ -1,5 +1,42 @@ #ifndef D_A_OBJ_SWLIGHT_H #define D_A_OBJ_SWLIGHT_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjSwLight_c + * @brief Light Switch + * + * @details + * + */ +class daObjSwLight_c : public fopAc_ac_c { +public: + /* 80CF6F98 */ void initBaseMtx(); + /* 80CF6FD4 */ void setBaseMtx(); + /* 80CF7038 */ void Create(); + /* 80CF71F0 */ void CreateHeap(); + /* 80CF7260 */ void create1st(); + /* 80CF7320 */ void Execute(f32 (**)[3][4]); + /* 80CF73E0 */ void action(); + /* 80CF761C */ void init_modeSwOnWait(); + /* 80CF766C */ void modeSwOnWait(); + /* 80CF777C */ void init_modeOnLight(); + /* 80CF7788 */ void modeOnLight(); + /* 80CF77D8 */ void init_modeSwOffWait(); + /* 80CF7838 */ void modeSwOffWait(); + /* 80CF7974 */ void modeDead(); + /* 80CF7978 */ void checkHit(); + /* 80CF7A6C */ void setOnTimer(); + /* 80CF7A98 */ void Draw(); + /* 80CF7BA8 */ void Delete(); + /* 80CF8124 */ ~daObjSwLight_c(); + +private: + /* 0x568 */ u8 field_0x568[0xb28 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjSwLight_c) == 0xb28); + #endif /* D_A_OBJ_SWLIGHT_H */ diff --git a/include/rel/d/a/obj/d_a_obj_swchain/d_a_obj_swchain.h b/include/rel/d/a/obj/d_a_obj_swchain/d_a_obj_swchain.h index 5bd32127727..6faee1d8412 100644 --- a/include/rel/d/a/obj/d_a_obj_swchain/d_a_obj_swchain.h +++ b/include/rel/d/a/obj/d_a_obj_swchain/d_a_obj_swchain.h @@ -1,5 +1,44 @@ #ifndef D_A_OBJ_SWCHAIN_H #define D_A_OBJ_SWCHAIN_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjSwChain_c + * @brief Chain Switch + * + * @details + * + */ +class daObjSwChain_c : public fopAc_ac_c { +public: + struct chain_s { + public: + /* 80CF8B00 */ ~chain_s(); + /* 80CF8B3C */ chain_s(); + }; + + /* 80CF8768 */ void Create(); + /* 80CF89C0 */ void CreateHeap(); + /* 80CF8B48 */ void create1st(); + /* 80CF8ED0 */ void execute(); + /* 80CF94E4 */ void getChainBasePos(cXyz*); + /* 80CF9500 */ void chain_control(); + /* 80CF99C0 */ void chain_control2(); + /* 80CFA05C */ void initChainMtx(); + /* 80CFA124 */ void setChainMtx(); + /* 80CFA4A8 */ void chain_count_control(); + /* 80CFAD50 */ void setTension(); + /* 80CFB450 */ void getTopChainNo(); + /* 80CFB464 */ void checkPlayerPull(); + /* 80CFB53C */ void draw(); + /* 80CFB5E8 */ void _delete(); + +private: + /* 0x568 */ u8 field_0x568[0xaa0 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjSwChain_c) == 0xaa0); + #endif /* D_A_OBJ_SWCHAIN_H */ diff --git a/include/rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.h b/include/rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.h index 150116fa127..657da4440fc 100644 --- a/include/rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.h +++ b/include/rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.h @@ -6,6 +6,14 @@ #include "d/cc/d_cc_d.h" #include "d/event/d_event_lib.h" +/** + * @ingroup actors-objects + * @class daObjSwHang_c + * @brief Dangle A + * + * @details + * + */ class daObjSwHang_c : public dBgS_MoveBgActor { public: /* 80101874 */ cXyz getHangPos(); @@ -34,6 +42,7 @@ class daObjSwHang_c : public dBgS_MoveBgActor { void setHangPlayer() { mHangPlayer = 1; } u8 getType() { return field_0x730; } +private: /* 0x5A0 */ dEvLib_callback_c field_0x5a0; /* 0x5B0 */ request_of_phase_process_class mPhase; /* 0x5B8 */ J3DModel* mpModel; @@ -53,6 +62,7 @@ class daObjSwHang_c : public dBgS_MoveBgActor { /* 0x784 */ f32 field_0x784; /* 0x788 */ f32 field_0x788; /* 0x78C */ s16 field_0x78c; -}; // Size: 0x790 +}; +STATIC_ASSERT(sizeof(daObjSwHang_c) == 0x790); #endif /* D_A_OBJ_SWHANG_H */ diff --git a/include/rel/d/a/obj/d_a_obj_sword/d_a_obj_sword.h b/include/rel/d/a/obj/d_a_obj_sword/d_a_obj_sword.h index 7bb06b523c3..377ec93c5bf 100644 --- a/include/rel/d/a/obj/d_a_obj_sword/d_a_obj_sword.h +++ b/include/rel/d/a/obj/d_a_obj_sword/d_a_obj_sword.h @@ -1,6 +1,34 @@ #ifndef D_A_OBJ_SWORD_H #define D_A_OBJ_SWORD_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjSword_c + * @brief Ordon Sword + * + * @details + * + */ +class daObjSword_c : public fopAc_ac_c { +public: + /* 80CFD558 */ void initBaseMtx(); + /* 80CFD594 */ void setBaseMtx(); + /* 80CFD600 */ void Create(); + /* 80CFD67C */ void create(); + /* 80CFDA14 */ void actionWait(); + /* 80CFDA8C */ void initActionOrderGetDemo(); + /* 80CFDB04 */ void actionOrderGetDemo(); + /* 80CFDB80 */ void actionGetDemo(); + /* 80CFDC1C */ void execute(); + /* 80CFDD18 */ void draw(); + /* 80CFDD6C */ void _delete(); + +private: + /* 0x568 */ u8 field_0x568[0x938 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjSword_c) == 0x938); + #endif /* D_A_OBJ_SWORD_H */ diff --git a/include/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.h b/include/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.h index 5336a6e0982..5d98c818516 100644 --- a/include/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.h +++ b/include/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.h @@ -4,6 +4,14 @@ #include "d/cc/d_cc_d.h" #include "f_op/f_op_actor_mng.h" +/** + * @ingroup actors-objects + * @class daObjSwPr_c + * @brief Boomerang Switch + * + * @details + * + */ class daObjSwPr_c : public fopAc_ac_c { public: /* 8059A5E8 */ void initBaseMtx(); @@ -45,5 +53,6 @@ class daObjSwPr_c : public fopAc_ac_c { /* 0x83D */ u8 field_0x83d; /* 0x83E */ u8 mModelType; }; +STATIC_ASSERT(sizeof(daObjSwPr_c) == 0x840); #endif /* D_A_OBJ_SWPROPELLER_H */ diff --git a/include/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.h b/include/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.h index dc2fcc377ad..bc5512a2032 100644 --- a/include/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.h +++ b/include/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.h @@ -1,6 +1,82 @@ #ifndef D_A_OBJ_SWPUSH_H #define D_A_OBJ_SWPUSH_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjSwpush + * @brief Push Switch + * + * @details This is a multi-purpose depression switch actor. + * Used by: Gold Pressure Switch, Lakebed Pressure Switch + * + */ +class daObjSwpush : public fopAc_ac_c { +public: + class Act_c { + public: + struct Prm_e {}; + + /* 80482D4C */ void prmZ_init(); + /* 80482D7C */ void is_switch2() const; + /* 80482DC4 */ void solidHeapCB(fopAc_ac_c*); + /* 80482DE8 */ void create_heap(); + /* 80482FE8 */ void create_res_load(); + /* 80483038 */ void Mthd_Create(); + /* 8048348C */ void Mthd_Delete(); + /* 804834E8 */ void set_mtx(); + /* 80483534 */ void init_mtx(); + /* 80483570 */ void set_btp_frame(); + /* 80483574 */ void rideCB(dBgW*, fopAc_ac_c*, fopAc_ac_c*); + /* 804839B4 */ void jnodeCB(J3DJoint*, int); + /* 80483A5C */ void calc_top_pos(); + /* 80483B70 */ void top_bg_aim_req(f32, s16); + /* 80483B7C */ void set_push_flag(); + /* 80483D0C */ void mode_upper_init(); + /* 80483D2C */ void mode_upper(); + /* 80483FA8 */ void mode_u_l_init(); + /* 80484008 */ void mode_u_l(); + /* 804841D4 */ void mode_lower_init(); + /* 804841F4 */ void mode_lower(); + /* 80484388 */ void mode_l_u_init(); + /* 804843C0 */ void mode_l_u(); + /* 80484570 */ void demo_non_init(); + /* 8048457C */ void demo_non(); + /* 80484580 */ void demo_reqPause_init(); + /* 804845D8 */ void demo_reqPause(); + /* 8048460C */ void demo_runPause_init(); + /* 8048464C */ void demo_runPause(); + /* 804846B4 */ void demo_stop_puase(); + /* 80484708 */ void demo_reqSw_init(); + /* 804847B4 */ void demo_reqSw(); + /* 80484828 */ void demo_runSw_init(); + /* 80484834 */ void demo_runSw(); + /* 80484890 */ void check_ride_couple(s16); + /* 804848D8 */ void nr_ride_people(char); + /* 80484908 */ void Mthd_Execute(); + /* 80484BB8 */ void Mthd_Draw(); + + static u8 const M_bmd[6 + 2 /* padding */]; + static u8 const M_dzb[6 + 2 /* padding */]; + static u8 const M_heap_size[12]; + static u8 const M_attr[220]; + static u32 const M_op_vtx; + static void* M_arcname[3]; + }; + +private: + /* 0x568 */ u8 field_0x568[0x604 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjSwpush) == 0x604); + +struct daObj { +public: + template + void PrmAbstract(/* ... */); + /* 80484CE4 */ /* daObj::PrmAbstract */ + void func_80484CE4(void* _this, fopAc_ac_c const*, daObjSwpush::Act_c::Prm_e, + daObjSwpush::Act_c::Prm_e); +}; #endif /* D_A_OBJ_SWPUSH_H */ diff --git a/include/rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2.h b/include/rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2.h index d6d7dc1a15c..a28da30db68 100644 --- a/include/rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2.h +++ b/include/rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2.h @@ -1,6 +1,82 @@ #ifndef D_A_OBJ_SWPUSH2_H #define D_A_OBJ_SWPUSH2_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjSwpush2 + * @brief Push Switch 2 + * + * @details + * + */ +class daObjSwpush2 : public fopAc_ac_c { +public: + class Act_c { + public: + struct Prm_e {}; + + /* 80CFE098 */ void getArcName(); + /* 80CFE0A4 */ void getBmdName(); + /* 80CFE0B4 */ void getDzbName(); + /* 80CFE0C4 */ void getNmlBtkName(); + /* 80CFE0D4 */ void getNmlBrkName(); + /* 80CFE0E4 */ void getOnBtkName(); + /* 80CFE0F4 */ void getRunBpkName(); + /* 80CFE104 */ void getRunBrkName(); + /* 80CFE114 */ void getRunBtkName(); + /* 80CFE124 */ void prmZ_init(); + /* 80CFE154 */ void is_switch2() const; + /* 80CFE1AC */ void solidHeapCB(fopAc_ac_c*); + /* 80CFE1D0 */ void create_heap(); + /* 80CFE6D8 */ void create_init(); + /* 80CFE8CC */ void create_res_load(); + /* 80CFE928 */ void Mthd_Create(); + /* 80CFEA3C */ void Mthd_Delete(); + /* 80CFEAB4 */ void set_mtx(); + /* 80CFEB3C */ void init_mtx(); + /* 80CFEB78 */ void rideCB(dBgW*, fopAc_ac_c*, fopAc_ac_c*); + /* 80CFEBE4 */ void calc_top_pos(); + /* 80CFEC4C */ void set_push_flag(); + /* 80CFEDDC */ void mode_upper_init(); + /* 80CFEDFC */ void mode_upper(); + /* 80CFEF84 */ void mode_u_l_init(); + /* 80CFEF98 */ void mode_u_l(); + /* 80CFF168 */ void mode_lower_init(); + /* 80CFF188 */ void mode_lower(); + /* 80CFF18C */ void mode_l_u(); + /* 80CFF24C */ void demo_non_init(); + /* 80CFF258 */ void demo_non(); + /* 80CFF25C */ void demo_reqPause_init(); + /* 80CFF2B4 */ void demo_reqPause(); + /* 80CFF2EC */ void demo_runPause_init(int); + /* 80CFF31C */ void demo_runPause(); + /* 80CFF374 */ void demo_stop_puase(); + /* 80CFF3C8 */ void demo_reqSw_init(); + /* 80CFF48C */ void demo_reqSw(); + /* 80CFF500 */ void demo_runSw_init(); + /* 80CFF50C */ void demo_runSw(); + /* 80CFF568 */ void Mthd_Execute(); + /* 80CFF8FC */ void Mthd_Draw(); + + static u8 const M_arcname[9 + 3 /* padding */]; + static void* const M_attr[56]; + }; + +private: + /* 0x568 */ u8 field_0x568[0x5f4 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjSwpush2) == 0x5f4); + +struct daObj { +public: + template + void PrmAbstract(/* ... */); + /* 80CFFBD0 */ /* daObj::PrmAbstract */ + void func_80CFFBD0(void* _this, fopAc_ac_c const*, daObjSwpush2::Act_c::Prm_e, + daObjSwpush2::Act_c::Prm_e); +}; + #endif /* D_A_OBJ_SWPUSH2_H */ diff --git a/include/rel/d/a/obj/d_a_obj_swpush5/d_a_obj_swpush5.h b/include/rel/d/a/obj/d_a_obj_swpush5/d_a_obj_swpush5.h index d362820d06b..c37d413e7a7 100644 --- a/include/rel/d/a/obj/d_a_obj_swpush5/d_a_obj_swpush5.h +++ b/include/rel/d/a/obj/d_a_obj_swpush5/d_a_obj_swpush5.h @@ -1,6 +1,53 @@ #ifndef D_A_OBJ_SWPUSH5_H #define D_A_OBJ_SWPUSH5_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjSw5_c + * @brief Push Switch 5 + * + * @details Mutli-purpose heavy switch actor. (Iron Boots switch) + * + */ +class daObjSw5_c : public fopAc_ac_c { +public: + /* 8059B804 */ void initBaseMtx(); + /* 8059B88C */ void setBaseMtx(); + /* 8059B920 */ void Create(); + /* 8059BA1C */ void CreateHeap(); + /* 8059BB1C */ void create(); + /* 8059BBD4 */ void Execute(f32 (**)[3][4]); + /* 8059BC70 */ void setting_ride_flag(); + /* 8059BD24 */ bool checkPushable(); + /* 8059BD2C */ void event_proc_call(); + /* 8059BE18 */ void actionPauseNoneInit(); + /* 8059BE24 */ void actionPauseNone(); + /* 8059BE28 */ void actionPauseOrderInit(); + /* 8059BE80 */ void actionPauseOrder(); + /* 8059BEB4 */ void actionPauseInit(); + /* 8059BEE0 */ void actionPause(); + /* 8059BF48 */ void actionWait(); + /* 8059BF4C */ void actionOrder(); + /* 8059BF50 */ void actionEvent(); + /* 8059BF54 */ void calc_top_pos(); + /* 8059BFE4 */ void mode_proc_call(); + /* 8059C0A0 */ void modeWaitLowerInit(); + /* 8059C0C8 */ void modeWaitLower(); + /* 8059C23C */ void modeLowerInit(); + /* 8059C2D0 */ void modeLower(); + /* 8059C364 */ void modeWaitUpperInit(); + /* 8059C370 */ void modeWaitUpper(); + /* 8059C3C4 */ void modeUpperInit(); + /* 8059C454 */ void modeUpper(); + /* 8059C4BC */ void Draw(); + /* 8059C560 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x600 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjSw5_c) == 0x600); + #endif /* D_A_OBJ_SWPUSH5_H */ diff --git a/include/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.h b/include/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.h index 04b5fe0da14..f377f188708 100644 --- a/include/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.h +++ b/include/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.h @@ -5,6 +5,14 @@ #include "d/bg/d_bg_w.h" #include "rel/d/a/d_a_spinner/d_a_spinner.h" +/** + * @ingroup actors-objects + * @class daObjSwSpinner_c + * @brief Spinner Switch + * + * @details + * + */ class daObjSwSpinner_c : public dBgS_MoveBgActor { public: /* 80D00174 */ void initBaseMtx(); @@ -33,6 +41,7 @@ class daObjSwSpinner_c : public dBgS_MoveBgActor { /* 0x5EC */ s16 mShapeAngleY; /* 0x5EE */ s16 mRotSpeedY; /* 0x5F0 */ s16 mCount; -}; // Size: 0x5F4 +}; +STATIC_ASSERT(sizeof(daObjSwSpinner_c) == 0x5F4); #endif /* D_A_OBJ_SWSPINNER_H */ diff --git a/include/rel/d/a/obj/d_a_obj_swturn/d_a_obj_swturn.h b/include/rel/d/a/obj/d_a_obj_swturn/d_a_obj_swturn.h index bdecc1c5579..24176fd9c75 100644 --- a/include/rel/d/a/obj/d_a_obj_swturn/d_a_obj_swturn.h +++ b/include/rel/d/a/obj/d_a_obj_swturn/d_a_obj_swturn.h @@ -1,6 +1,38 @@ #ifndef D_A_OBJ_SWTURN_H #define D_A_OBJ_SWTURN_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjSwTurn_c + * @brief Arbiter's Ground Turn Switch + * + * @details + * + */ +class daObjSwTurn_c : public fopAc_ac_c { +public: + /* 80D00CD8 */ void initBaseMtx(); + /* 80D00D14 */ void setBaseMtx(); + /* 80D00D78 */ void Create(); + /* 80D00EE4 */ void CreateHeap(); + /* 80D00F64 */ void create1st(); + /* 80D01074 */ void Execute(f32 (**)[3][4]); + /* 80D010D4 */ void mode_proc_call(); + /* 80D01160 */ void init_modeWait(); + /* 80D01198 */ void modeWait(); + /* 80D01770 */ void init_modeRotate(); + /* 80D018B4 */ void modeRotate(); + /* 80D01958 */ void rotate_sub_0(); + /* 80D01B60 */ void rotate_sub_1(); + /* 80D01EB0 */ void Draw(); + /* 80D01F58 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x5e0 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjSwTurn_c) == 0x5e0); + #endif /* D_A_OBJ_SWTURN_H */ diff --git a/include/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock.h b/include/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock.h index 2921666beeb..dd62cba3fc4 100644 --- a/include/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock.h +++ b/include/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock.h @@ -1,6 +1,57 @@ #ifndef D_A_OBJ_SYROCK_H #define D_A_OBJ_SYROCK_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daSyRock_c + * @brief Stalactite Rock + * + * @details + * + */ +class daSyRock_c : public fopAc_ac_c { +public: + /* 80D0237C */ void setBaseMtx(); + /* 80D02454 */ void CreateHeap(); + /* 80D02584 */ void create(); + /* 80D02AFC */ void setFallStat(); + /* 80D02BE0 */ void Execute(f32 (**)[3][4]); + /* 80D02C54 */ void move(); + /* 80D02E70 */ void init_modeWait(); + /* 80D02E7C */ void modeWait(); + /* 80D02F88 */ void eventStart(); + /* 80D02FB8 */ void init_modeDropInit(); + /* 80D03070 */ void modeDropInit(); + /* 80D030A8 */ void searchWaterPillar(void*, void*); + /* 80D03250 */ void init_modeDrop(); + /* 80D03384 */ void modeDrop(); + /* 80D033D0 */ void init_modeSink(); + /* 80D03440 */ void modeSink(); + /* 80D034E8 */ void init_modeMove(); + /* 80D035F8 */ void modeMove(); + /* 80D036B8 */ void chkWaterLineIn(); + /* 80D036DC */ void bgCheck(); + /* 80D03984 */ void init_modeDropEnd(); + /* 80D03A48 */ void modeDropEnd(); + /* 80D03A4C */ void Draw(); + /* 80D03B08 */ void Delete(); + /* 80D03DAC */ ~daSyRock_c(); + + static u8 const mCcDObjInfo[48]; + static u8 mCcDCyl[68]; + +private: + /* 0x568 */ u8 field_0x568[0x9a0 - 0x568]; +}; +STATIC_ASSERT(sizeof(daSyRock_c) == 0x9a0); + +class daSyRock_HIO_c { +public: + /* 80D022AC */ daSyRock_HIO_c(); + /* 80D03C44 */ ~daSyRock_HIO_c(); +}; + #endif /* D_A_OBJ_SYROCK_H */ diff --git a/include/rel/d/a/obj/d_a_obj_szbridge/d_a_obj_szbridge.h b/include/rel/d/a/obj/d_a_obj_szbridge/d_a_obj_szbridge.h index bbd2c608d4a..0c54d41ed81 100644 --- a/include/rel/d/a/obj/d_a_obj_szbridge/d_a_obj_szbridge.h +++ b/include/rel/d/a/obj/d_a_obj_szbridge/d_a_obj_szbridge.h @@ -1,6 +1,33 @@ #ifndef D_A_OBJ_SZBRIDGE_H #define D_A_OBJ_SZBRIDGE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjSZbridge_c + * @brief Stone Statue Bridge + * + * @details + * + */ +class daObjSZbridge_c : public fopAc_ac_c { +public: + /* 80D04360 */ void rideActor(fopAc_ac_c*); + /* 80D04424 */ void create1st(); + /* 80D044B8 */ void setMtx(); + /* 80D04528 */ void CreateHeap(); + /* 80D04598 */ void chkBg(); + /* 80D048C4 */ void Create(); + /* 80D04974 */ void Execute(f32 (**)[3][4]); + /* 80D049E4 */ void Draw(); + /* 80D04A88 */ void Delete(); + /* 80D04B90 */ ~daObjSZbridge_c(); + +private: + /* 0x568 */ u8 field_0x568[0x624 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjSZbridge_c) == 0x624); + #endif /* D_A_OBJ_SZBRIDGE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence.h b/include/rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence.h index 25678237969..b0c4df252f7 100644 --- a/include/rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence.h +++ b/include/rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence.h @@ -1,6 +1,47 @@ #ifndef D_A_OBJ_TAFENCE_H #define D_A_OBJ_TAFENCE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daTaFence_c + * @brief Fench/Mesh? + * + * @details + * + */ +class daTaFence_c : public fopAc_ac_c { +public: + /* 80D04F8C */ void setBaseMtx(); + /* 80D0503C */ void CreateHeap(); + /* 80D050A8 */ void create(); + /* 80D05550 */ void Execute(f32 (**)[3][4]); + /* 80D055A0 */ void fenceProc(); + /* 80D057C4 */ void init_modeWait(); + /* 80D057D0 */ void modeWait(); + /* 80D05A54 */ void init_modeMoveInit(); + /* 80D05B5C */ void modeMoveInit(); + /* 80D05B94 */ void init_modeMove(); + /* 80D05CAC */ void modeMove(); + /* 80D05D2C */ void init_modeMoveEnd(); + /* 80D05E54 */ void modeMoveEnd(); + /* 80D05E58 */ void Draw(); + /* 80D05EFC */ void Delete(); + + static u8 const mCcDObjInfo[48]; + static u8 mCcDCyl[68]; + +private: + /* 0x568 */ u8 field_0x568[0x13d4 - 0x568]; +}; +STATIC_ASSERT(sizeof(daTaFence_c) == 0x13d4); + +class daTaFence_HIO_c { +public: + /* 80D04E6C */ daTaFence_HIO_c(); + /* 80D06000 */ ~daTaFence_HIO_c(); +}; + #endif /* D_A_OBJ_TAFENCE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_table/d_a_obj_table.h b/include/rel/d/a/obj/d_a_obj_table/d_a_obj_table.h index 1c4ef682118..0e454aa0532 100644 --- a/include/rel/d/a/obj/d_a_obj_table/d_a_obj_table.h +++ b/include/rel/d/a/obj/d_a_obj_table/d_a_obj_table.h @@ -5,6 +5,14 @@ #include "d/msg/d_msg_flow.h" #include "f_op/f_op_actor_mng.h" +/** + * @ingroup actors-objects + * @class daObjTable_c + * @brief Table + * + * @details + * + */ class daObjTable_c : public dBgS_MoveBgActor { public: /* 80D06560 */ int CreateHeap(); @@ -19,12 +27,13 @@ class daObjTable_c : public dBgS_MoveBgActor { s16 getMessageNo() { return (s16)fopAcM_GetParamBit(this, 0, 16); } +private: /* 0x5A0 */ J3DModel* mpModel; /* 0x5A4 */ request_of_phase_process_class mPhaseReq; /* 0x5AC */ dMsgFlow_c mMsgFlow; /* 0x5F8 */ u32 mShadowKey; /* 0x5FC */ s16 mEventID; -}; // Size: 0x600 +}; STATIC_ASSERT(sizeof(daObjTable_c) == 0x600); diff --git a/include/rel/d/a/obj/d_a_obj_takaraDai/d_a_obj_takaraDai.h b/include/rel/d/a/obj/d_a_obj_takaraDai/d_a_obj_takaraDai.h index e157e72f93c..2c9ee82a749 100644 --- a/include/rel/d/a/obj/d_a_obj_takaraDai/d_a_obj_takaraDai.h +++ b/include/rel/d/a/obj/d_a_obj_takaraDai/d_a_obj_takaraDai.h @@ -1,6 +1,38 @@ #ifndef D_A_OBJ_TAKARADAI_H #define D_A_OBJ_TAKARADAI_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daTkraDai_c + * @brief Flight-by-Fowl Platform + * + * @details + * + */ +class daTkraDai_c : public fopAc_ac_c { +public: + /* 80D06E64 */ void setBaseMtx(); + /* 80D06FFC */ void CreateHeap(); + /* 80D07140 */ void create(); + /* 80D07344 */ void Execute(f32 (**)[3][4]); + /* 80D073A4 */ void procMain(); + /* 80D074D0 */ void init_modeWait(); + /* 80D07528 */ void modeWait(); + /* 80D075A4 */ void Draw(); + /* 80D07668 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x65c - 0x568]; +}; +STATIC_ASSERT(sizeof(daTkraDai_c) == 0x65c); + +class daTkraDai_HIO_c { +public: + /* 80D06D8C */ daTkraDai_HIO_c(); + /* 80D0775C */ ~daTkraDai_HIO_c(); +}; + #endif /* D_A_OBJ_TAKARADAI_H */ diff --git a/include/rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.h b/include/rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.h index 90d1c8399ff..ada1519772d 100644 --- a/include/rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.h +++ b/include/rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.h @@ -1,5 +1,27 @@ #ifndef D_A_OBJ_TATIGI_H #define D_A_OBJ_TATIGI_H +#include "f_op/f_op_actor_mng.h" + +struct tg_ss { +public: + /* 80D083C0 */ ~tg_ss(); + /* 80D08494 */ tg_ss(); +}; + +/** + * @ingroup actors-objects + * @class obj_tatigi_class + * @brief ??? + * + * @details + * + */ +class obj_tatigi_class : public fopAc_ac_c { +private: + /* 0x568 */ u8 field_0x568[0x1bc0 - 0x568]; +}; +STATIC_ASSERT(sizeof(obj_tatigi_class) == 0x1bc0); + #endif /* D_A_OBJ_TATIGI_H */ diff --git a/include/rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.h b/include/rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.h index 7ca7a532b07..0036ec1c384 100644 --- a/include/rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.h +++ b/include/rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.h @@ -1,5 +1,50 @@ #ifndef D_A_OBJ_TEN_H #define D_A_OBJ_TEN_H +#include "d/d_insect.h" + +/** + * @ingroup actors-objects + * @class daObjTEN_c + * @brief Insect - Ladybug + * + * @details + * + */ +class daObjTEN_c : public fopAc_ac_c { +public: + /* 80D087F4 */ void InitCcSph(); + /* 80D08860 */ void SetCcSph(); + /* 80D08C10 */ void WaitAction(); + /* 80D08D94 */ void WallCheck(); + /* 80D09008 */ void SpeedSet(); + /* 80D09114 */ void WallWalk(); + /* 80D09548 */ void WalkAction(); + /* 80D09748 */ void MoveAction(); + /* 80D09F58 */ void Action(); + /* 80D0A01C */ void ShopAction(); + /* 80D0A0D8 */ void checkGroundPos(); + /* 80D0A13C */ void Insect_Release(); + /* 80D0A154 */ void ParticleSet(); + /* 80D0A278 */ void BoomChk(); + /* 80D0A644 */ void Execute(); + /* 80D0A8C8 */ void ObjHit(); + /* 80D0AA50 */ void Z_BufferChk(); + /* 80D0ABCC */ void Delete(); + /* 80D0AC34 */ void setBaseMtx(); + /* 80D0AD9C */ void CreateChk(); + /* 80D0AF48 */ void create(); + +private: + /* 0x568 */ u8 field_0x568[0xa68 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjTEN_c) == 0xa68); + +class daObj_TenHIO_c { +public: + /* 80D087CC */ daObj_TenHIO_c(); + /* 80D0B848 */ ~daObj_TenHIO_c(); +}; + #endif /* D_A_OBJ_TEN_H */ diff --git a/include/rel/d/a/obj/d_a_obj_testcube/d_a_obj_testcube.h b/include/rel/d/a/obj/d_a_obj_testcube/d_a_obj_testcube.h index 48de43dfe3c..f0487e7e75d 100644 --- a/include/rel/d/a/obj/d_a_obj_testcube/d_a_obj_testcube.h +++ b/include/rel/d/a/obj/d_a_obj_testcube/d_a_obj_testcube.h @@ -1,6 +1,6 @@ #ifndef D_A_OBJ_TESTCUBE_H #define D_A_OBJ_TESTCUBE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" #endif /* D_A_OBJ_TESTCUBE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.h b/include/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.h index 49f25c6dedd..9f51963f595 100644 --- a/include/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.h +++ b/include/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.h @@ -4,6 +4,14 @@ #include "f_op/f_op_actor_mng.h" #include "d/bg/d_bg_s_movebg_actor.h" +/** + * @ingroup actors-objects + * @class daObjGake_c + * @brief Howling Cliff + * + * @details + * + */ class daObjGake_c : public dBgS_MoveBgActor { public: /* 80D0BC18 */ void initBaseMtx(); @@ -20,11 +28,13 @@ class daObjGake_c : public dBgS_MoveBgActor { u16 getEventBit2() { return fopAcM_GetParamBit(this, 10, 10); } u8 getType() { return fopAcM_GetParamBit(this, 0x14, 8); } +private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ u16 mEventBit1; /* 0x5AE */ u16 mEventBit2; /* 0x5B0 */ u8 mHide; }; +STATIC_ASSERT(sizeof(daObjGake_c) == 0x5B4); #endif /* D_A_OBJ_TGAKE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_thashi/d_a_obj_thashi.h b/include/rel/d/a/obj/d_a_obj_thashi/d_a_obj_thashi.h index 2f6c0fc0601..53d84404ff1 100644 --- a/include/rel/d/a/obj/d_a_obj_thashi/d_a_obj_thashi.h +++ b/include/rel/d/a/obj/d_a_obj_thashi/d_a_obj_thashi.h @@ -1,5 +1,31 @@ #ifndef D_A_OBJ_THASHI_H #define D_A_OBJ_THASHI_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjTHASHI_c + * @brief T Pillar + * + * @details + * + */ +class daObjTHASHI_c : public fopAc_ac_c { +public: + /* 80D0C238 */ void initCcCylinder(); + /* 80D0C354 */ void setBaseMtx(); + /* 80D0C654 */ void CreateHeap(); + /* 80D0C8B4 */ void create(); + /* 80D0CE70 */ void Create(); + /* 80D0CEB4 */ void Execute(f32 (**)[3][4]); + /* 80D0CEE0 */ void Draw(); + /* 80D0D140 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x1bbc - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjTHASHI_c) == 0x1bbc); + #endif /* D_A_OBJ_THASHI_H */ diff --git a/include/rel/d/a/obj/d_a_obj_thdoor/d_a_obj_thdoor.h b/include/rel/d/a/obj/d_a_obj_thdoor/d_a_obj_thdoor.h index 012a31d56aa..b030f6d0645 100644 --- a/include/rel/d/a/obj/d_a_obj_thdoor/d_a_obj_thdoor.h +++ b/include/rel/d/a/obj/d_a_obj_thdoor/d_a_obj_thdoor.h @@ -1,5 +1,40 @@ #ifndef D_A_OBJ_THDOOR_H #define D_A_OBJ_THDOOR_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjThDoor_c + * @brief Telma's Bar Door + * + * @details + * + */ +class daObjThDoor_c : public fopAc_ac_c { +public: + /* 80D0D618 */ void initBaseMtx(); + /* 80D0D654 */ void setBaseMtx(); + /* 80D0D6B8 */ void Create(); + /* 80D0D7F8 */ void CreateHeap(); + /* 80D0D868 */ void create1st(); + /* 80D0D8E8 */ void Execute(f32 (**)[3][4]); + /* 80D0D9B4 */ void set_cyl(); + /* 80D0DAC8 */ void action(); + /* 80D0DB90 */ void event_proc_call(); + /* 80D0DC4C */ void actionWait(); + /* 80D0DCC8 */ void actionOrderEvent(); + /* 80D0DD90 */ void actionEvent(); + /* 80D0DE30 */ void actionDead(); + /* 80D0DE34 */ void demoProc(); + /* 80D0E06C */ void checkArea(); + /* 80D0E150 */ void Draw(); + /* 80D0E1F4 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x8c0 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjThDoor_c) == 0x8c0); + #endif /* D_A_OBJ_THDOOR_H */ diff --git a/include/rel/d/a/obj/d_a_obj_timeFire/d_a_obj_timeFire.h b/include/rel/d/a/obj/d_a_obj_timeFire/d_a_obj_timeFire.h index e343178d7da..627f69b8675 100644 --- a/include/rel/d/a/obj/d_a_obj_timeFire/d_a_obj_timeFire.h +++ b/include/rel/d/a/obj/d_a_obj_timeFire/d_a_obj_timeFire.h @@ -1,6 +1,38 @@ #ifndef D_A_OBJ_TIMEFIRE_H #define D_A_OBJ_TIMEFIRE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daTimeFire_c + * @brief Time Fire + * + * @details + * + */ +class daTimeFire_c : public fopAc_ac_c { +public: + /* 80D0E958 */ void setBaseMtx(); + /* 80D0E9B0 */ void create(); + /* 80D0EACC */ void lightInit(); + /* 80D0EB40 */ void setLight(); + /* 80D0EB64 */ void cutLight(); + /* 80D0EB88 */ void Execute(); + /* 80D0ED68 */ void fireCheck(u8); + /* 80D0EF88 */ bool Draw(); + /* 80D0EF90 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x5c0 - 0x568]; +}; +STATIC_ASSERT(sizeof(daTimeFire_c) == 0x5c0); + +class daTimeFire_HIO_c { +public: + /* 80D0E8EC */ daTimeFire_HIO_c(); + /* 80D0F038 */ ~daTimeFire_HIO_c(); +}; + #endif /* D_A_OBJ_TIMEFIRE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_timer/d_a_obj_timer.h b/include/rel/d/a/obj/d_a_obj_timer/d_a_obj_timer.h index 02b25a215da..14529dab036 100644 --- a/include/rel/d/a/obj/d_a_obj_timer/d_a_obj_timer.h +++ b/include/rel/d/a/obj/d_a_obj_timer/d_a_obj_timer.h @@ -1,6 +1,43 @@ #ifndef D_A_OBJ_TIMER_H #define D_A_OBJ_TIMER_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjTimer + * @brief Timer + * + * @details + * + */ +class daObjTimer : public fopAc_ac_c { +public: + class Act_c { + public: + struct Prm_e {}; + + /* 80485198 */ void _create(); + /* 8048526C */ bool _delete(); + /* 80485274 */ void mode_wait_init(); + /* 80485284 */ void mode_wait(); + /* 804852E0 */ void mode_count_init(); + /* 80485324 */ void mode_count(); + /* 804854BC */ void _execute(); + }; + +private: + /* 0x568 */ u8 field_0x568[0x574 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjTimer) == 0x574); + +struct daObj { +public: + template + void PrmAbstract(/* ... */); + /* 8048561C */ /* daObj::PrmAbstract */ + void func_8048561C(void* _this, fopAc_ac_c const*, daObjTimer::Act_c::Prm_e, + daObjTimer::Act_c::Prm_e); +}; #endif /* D_A_OBJ_TIMER_H */ diff --git a/include/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.h b/include/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.h index 48fee8d440e..d2166f1636a 100644 --- a/include/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.h +++ b/include/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.h @@ -1,6 +1,58 @@ #ifndef D_A_OBJ_TKS_H #define D_A_OBJ_TKS_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjTks_c + * @brief Ooccoo Jr. (small) + * + * @details + * + */ +class daObjTks_c : public fopAc_ac_c { +public: + /* 80D0F28C */ daObjTks_c(); + /* 80D0F480 */ ~daObjTks_c(); + /* 80D0F640 */ void Create(); + /* 80D0F904 */ void CreateHeap(); + /* 80D0FD34 */ void Delete(); + /* 80D0FD68 */ void Execute(); + /* 80D0FE60 */ void Draw(); + /* 80D0FED0 */ void ctrlJoint(J3DJoint*, J3DModel*); + /* 80D10094 */ void createHeapCallBack(fopAc_ac_c*); + /* 80D100B4 */ void ctrlJointCallBack(J3DJoint*, int); + /* 80D10100 */ void setMtx(); + /* 80D10184 */ void setExpressionAnm(int, bool); + /* 80D102D0 */ void setExpressionBtp(int); + /* 80D103A4 */ void setMotion(int, f32, int); + /* 80D103E8 */ void reset(); + /* 80D10578 */ void setAction(void (daObjTks_c::*)()); + /* 80D10618 */ void wait(); + /* 80D106C8 */ void setExpression(int, f32); + /* 80D106F4 */ void talk(); + /* 80D10A80 */ void demo(); + /* 80D11104 */ void setMotionAnm(int, f32); + /* 80D11228 */ void warp(); + /* 80D11670 */ void setParam(); + /* 80D116C8 */ void main(); + /* 80D118E8 */ void ctrlBtk(); + /* 80D119BC */ void setAttnPos(); + /* 80D11CB4 */ void lookat(); + /* 80D11E94 */ bool drawDbgInfo(); + /* 80D11E9C */ void drawOtherMdls(); + +private: + /* 0x568 */ u8 field_0x568[0xDE4 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjTks_c) == 0xDE4); + +class daObjTks_Param_c { +public: + /* 80D126D0 */ ~daObjTks_Param_c(); + + static u8 const m[128]; +}; #endif /* D_A_OBJ_TKS_H */ diff --git a/include/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.h b/include/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.h index 81c7d7b423d..a24675711ef 100644 --- a/include/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.h +++ b/include/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.h @@ -3,6 +3,14 @@ #include "d/com/d_com_inf_game.h" +/** + * @ingroup actors-objects + * @class daObjTMoon_c + * @brief Howling Moon + * + * @details + * + */ class daObjTMoon_c : public fopAc_ac_c { public: /* 80D12BB8 */ void initBaseMtx(); @@ -17,10 +25,12 @@ class daObjTMoon_c : public fopAc_ac_c { u32 getEventBit1() { return fopAcM_GetParamBit(this, 0, 10); } u32 getEventBit2() { return fopAcM_GetParamBit(this, 10, 10); } +private: /* 0x568 */ request_of_phase_process_class mPhaseReq; /* 0x570 */ J3DModel* mpModel; /* 0x574 */ u16 field_0x574; /* 0x576 */ u16 field_0x576; -}; // Size: 0x578 +}; +STATIC_ASSERT(sizeof(daObjTMoon_c) == 0x578); #endif /* D_A_OBJ_TMOON_H */ diff --git a/include/rel/d/a/obj/d_a_obj_toaru_maki/d_a_obj_toaru_maki.h b/include/rel/d/a/obj/d_a_obj_toaru_maki/d_a_obj_toaru_maki.h index b6c294f2134..e020e3fc238 100644 --- a/include/rel/d/a/obj/d_a_obj_toaru_maki/d_a_obj_toaru_maki.h +++ b/include/rel/d/a/obj/d_a_obj_toaru_maki/d_a_obj_toaru_maki.h @@ -2,5 +2,34 @@ #define D_A_OBJ_TOARU_MAKI_H #include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjToaruMaki_c + * @brief Ordon Bundle + * + * @details + * + */ +class daObjToaruMaki_c : public fopAc_ac_c, public request_of_phase_process_class { +public: + /* 80D13098 */ daObjToaruMaki_c(); + /* 80D130E0 */ virtual ~daObjToaruMaki_c(); + /* 80D1316C */ int createHeap(); + /* 80D132B4 */ int create(); + /* 80D133C0 */ int Delete(); + /* 80D1343C */ void setModelMtx(); + /* 80D134A0 */ int draw(); + /* 80D13524 */ int execute(); + + u32 getNameArg_0() { return fopAcM_GetParamBit(this, 0, 4); } + +private: + /* 0x574 */ J3DModel* mpModel; + /* 0x578 */ s32 field_0x578; + /* 0x57C */ Mtx mMtx; +}; +STATIC_ASSERT(sizeof(daObjToaruMaki_c) == 0x5AC); #endif /* D_A_OBJ_TOARU_MAKI_H */ diff --git a/include/rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.h b/include/rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.h index 02c2658a7a4..307f6bb33cb 100644 --- a/include/rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.h +++ b/include/rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.h @@ -1,6 +1,32 @@ #ifndef D_A_OBJ_TOBY_H #define D_A_OBJ_TOBY_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class obj_toby_class + * @brief Fyer (Object) + * + * @details + * + */ +class obj_toby_class : public fopAc_ac_c { +private: + /* 0x568 */ u8 field_0x568[0x6374 - 0x568]; +}; +STATIC_ASSERT(sizeof(obj_toby_class) == 0x6374); + +class daObj_Toby_HIO_c { +public: + /* 80D1378C */ daObj_Toby_HIO_c(); + /* 80D15534 */ ~daObj_Toby_HIO_c(); +}; + +struct yuka_s { +public: + /* 80D154F4 */ ~yuka_s(); + /* 80D15530 */ yuka_s(); +}; #endif /* D_A_OBJ_TOBY_H */ diff --git a/include/rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse.h b/include/rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse.h index 76c359c4b31..83ba5104b4b 100644 --- a/include/rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse.h +++ b/include/rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse.h @@ -1,6 +1,39 @@ #ifndef D_A_OBJ_TOBYHOUSE_H #define D_A_OBJ_TOBYHOUSE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjTobyHouse_c + * @brief Fyer's House + * + * @details + * + */ +class daObjTobyHouse_c : public fopAc_ac_c { +public: + /* 80D15F0C */ void initBaseMtx(); + /* 80D15F48 */ void setBaseMtx(); + /* 80D15FE0 */ void Create(); + /* 80D161A4 */ void CreateHeap(); + /* 80D163F0 */ void create1st(); + /* 80D164C0 */ void Execute(f32 (**)[3][4]); + /* 80D16560 */ void action(); + /* 80D1661C */ void actionWait(); + /* 80D166E0 */ void actionOrderEvent(); + /* 80D167BC */ void actionEvent(); + /* 80D16860 */ void actionDead(); + /* 80D16864 */ void demoProc(); + /* 80D171C0 */ void sceneChange(); + /* 80D17230 */ void Draw(); + /* 80D17374 */ void checkLODModel(); + /* 80D174F8 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x600 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjTobyHouse_c) == 0x600); + #endif /* D_A_OBJ_TOBYHOUSE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap.h b/include/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap.h index 2ab9d002538..407ceae09c5 100644 --- a/include/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap.h +++ b/include/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap.h @@ -1,6 +1,49 @@ #ifndef D_A_OBJ_TOGETRAP_H #define D_A_OBJ_TOGETRAP_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daTogeTrap_c + * @brief Blade Trap + * + * @details + * + */ +class daTogeTrap_c : public fopAc_ac_c { +public: + /* 80D17C74 */ void setBaseMtx(); + /* 80D17D5C */ void CreateHeap(); + /* 80D17E14 */ void create(); + /* 80D18244 */ void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*); + /* 80D1825C */ void Execute(f32 (**)[3][4]); + /* 80D182C8 */ void moveMain(); + /* 80D185DC */ void playerAreaCheck(); + /* 80D186B0 */ void init_modeWait(); + /* 80D186BC */ void modeWait(); + /* 80D186C0 */ void init_modeMoveUp(); + /* 80D18784 */ void modeMoveUp(); + /* 80D188C0 */ void init_modeMoveDown(); + /* 80D188DC */ void modeMoveDown(); + /* 80D18994 */ void init_modeBreak(); + /* 80D18A5C */ void modeBreak(); + /* 80D18BEC */ void Draw(); + /* 80D18CA4 */ void Delete(); + + static u8 const mCcDObjInfo[48]; + static u8 mCcDCyl[68]; + +private: + /* 0x568 */ u8 field_0x568[0xae4 - 0x568]; +}; +STATIC_ASSERT(sizeof(daTogeTrap_c) == 0xae4); + +class daTogeTrap_HIO_c { +public: + /* 80D17B6C */ daTogeTrap_HIO_c(); + /* 80D18DA8 */ ~daTogeTrap_HIO_c(); +}; + #endif /* D_A_OBJ_TOGETRAP_H */ diff --git a/include/rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.h b/include/rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.h index b417ef8f3c9..ca07d2127bb 100644 --- a/include/rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.h +++ b/include/rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.h @@ -1,5 +1,52 @@ #ifndef D_A_OBJ_TOMBO_H #define D_A_OBJ_TOMBO_H +#include "d/d_insect.h" + +/** + * @ingroup actors-objects + * @class daObjTOMBO_c + * @brief Insect - Dragonfly + * + * @details + * + */ +class daObjTOMBO_c : public fopAc_ac_c { +public: + /* 80D19200 */ void InitCcSph(); + /* 80D1926C */ void SetCcSph(); + /* 80D192E4 */ void CreateHeap(); + /* 80D19658 */ void WaitAction(); + /* 80D19744 */ void SpeedSet(); + /* 80D19834 */ void CheckWater(); + /* 80D199F4 */ void CheckGround(); + /* 80D19B48 */ void CheckWall(); + /* 80D19C34 */ void SearchLink(); + /* 80D19E48 */ void LinkAction(); + /* 80D1A138 */ void MoveAction(); + /* 80D1A280 */ void Action(); + /* 80D1A3EC */ void ShopAction(); + /* 80D1A514 */ void Insect_Release(); + /* 80D1A524 */ void ParticleSet(); + /* 80D1A648 */ void BoomChk(); + /* 80D1A904 */ void Execute(); + /* 80D1AB20 */ void ObjHit(); + /* 80D1AC84 */ void Z_BufferChk(); + /* 80D1AE00 */ void Delete(); + /* 80D1AE68 */ void setBaseMtx(); + /* 80D1AFC8 */ void CreateChk(); + /* 80D1B174 */ void create(); + +private: + /* 0x568 */ u8 field_0x568[0xa18 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjTOMBO_c) == 0xa18); + +class daObj_TomHIO_c { +public: + /* 80D191CC */ daObj_TomHIO_c(); + /* 80D1B618 */ ~daObj_TomHIO_c(); +}; + #endif /* D_A_OBJ_TOMBO_H */ diff --git a/include/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.h b/include/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.h index 50542791929..c25aabc042c 100644 --- a/include/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.h +++ b/include/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.h @@ -4,6 +4,14 @@ #include "d/com/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" +/** + * @ingroup actors-objects + * @class daObjTrnd_c + * @brief Tornado + * + * @details + * + */ class daObjTrnd_c : public fopAc_ac_c { public: /* 80D1B998 */ void setPntWind(); @@ -22,6 +30,7 @@ class daObjTrnd_c : public fopAc_ac_c { u32 getTimer() { return fopAcM_GetParamBit(this, 0, 8); } u32 getSwbit() { return fopAcM_GetParamBit(this, 0x18, 8); } +private: /* 0x568 */ dCcD_Stts mStts; /* 0x5A4 */ dCcD_Cps mCps; /* 0x6E8 */ cM3dGCpsS field_0x6e8; @@ -31,6 +40,7 @@ class daObjTrnd_c : public fopAc_ac_c { /* 0x73C */ f32 field_0x73c; /* 0x740 */ WIND_INFLUENCE mWindInfluence; /* 0x76C */ f32 mWindPower; -}; // Size: 0x770 +}; +STATIC_ASSERT(sizeof(daObjTrnd_c) == 0x770); #endif /* D_A_OBJ_TORNADO_H */ diff --git a/include/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.h b/include/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.h index 53067ba3942..49d1fe893e8 100644 --- a/include/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.h +++ b/include/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.h @@ -4,7 +4,16 @@ #include "f_op/f_op_actor_mng.h" #include "d/cc/d_cc_d.h" -struct daObjTrnd2_c : public fopAc_ac_c { +/** + * @ingroup actors-objects + * @class daObjTrnd2_c + * @brief Tornado 2 + * + * @details + * + */ +class daObjTrnd2_c : public fopAc_ac_c { +public: /* 80D1C4D8 */ void setPntWind(); /* 80D1C54C */ void cutPntWind(); /* 80D1C570 */ void movePntWind(); @@ -45,5 +54,6 @@ struct daObjTrnd2_c : public fopAc_ac_c { /* 0x778 */ bool field_0x778; /* 0x778 */ JPABaseEmitter* mParticles[3]; }; +STATIC_ASSERT(sizeof(daObjTrnd2_c) == 0x788); #endif /* D_A_OBJ_TORNADO2_H */ diff --git a/include/rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.h b/include/rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.h index a63729f98e6..8d37899be97 100644 --- a/include/rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.h +++ b/include/rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.h @@ -1,5 +1,21 @@ #ifndef D_A_OBJ_TP_H #define D_A_OBJ_TP_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class obj_tp_class + * @brief Shadow Beast Barrier Pole (Twilight Pole) + * + * @details + * + */ +class obj_tp_class : public fopAc_ac_c { +private: + /* 0x568 */ u8 field_0x568[0x784 - 0x568]; +}; +STATIC_ASSERT(sizeof(obj_tp_class) == 0x784); + #endif /* D_A_OBJ_TP_H */ diff --git a/include/rel/d/a/obj/d_a_obj_treesh/d_a_obj_treesh.h b/include/rel/d/a/obj/d_a_obj_treesh/d_a_obj_treesh.h index 8b02b4d33b2..e2a6c026ce1 100644 --- a/include/rel/d/a/obj/d_a_obj_treesh/d_a_obj_treesh.h +++ b/include/rel/d/a/obj/d_a_obj_treesh/d_a_obj_treesh.h @@ -1,6 +1,37 @@ #ifndef D_A_OBJ_TREESH_H #define D_A_OBJ_TREESH_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daTreeSh_c + * @brief Conifer Tree + * + * @details + * + */ +class daTreeSh_c : public fopAc_ac_c { +public: + /* 80D1F258 */ void initBaseMtx(); + /* 80D1F294 */ void setBaseMtx(); + /* 80D1F2E8 */ void CreateHeap(); + /* 80D1F358 */ void Create(); + /* 80D1F414 */ void create1st(); + /* 80D1F49C */ void Execute(f32 (**)[3][4]); + /* 80D1F648 */ void Draw(); + /* 80D1F6EC */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x5cc - 0x568]; +}; +STATIC_ASSERT(sizeof(daTreeSh_c) == 0x5cc); + +class daTreeSh_HIO_c { +public: + /* 80D1F0CC */ daTreeSh_HIO_c(); + /* 80D1F81C */ ~daTreeSh_HIO_c(); +}; + #endif /* D_A_OBJ_TREESH_H */ diff --git a/include/rel/d/a/obj/d_a_obj_twGate/d_a_obj_twGate.h b/include/rel/d/a/obj/d_a_obj_twGate/d_a_obj_twGate.h index 13ab7da0fd9..9697d9d1a08 100644 --- a/include/rel/d/a/obj/d_a_obj_twGate/d_a_obj_twGate.h +++ b/include/rel/d/a/obj/d_a_obj_twGate/d_a_obj_twGate.h @@ -1,6 +1,33 @@ #ifndef D_A_OBJ_TWGATE_H #define D_A_OBJ_TWGATE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daTwGate_c + * @brief Twilight Gate (Wall?) + * + * @details + * + */ +class daTwGate_c : public fopAc_ac_c { +public: + /* 80D1FB84 */ void setBaseMtx(); + /* 80D1FC0C */ void CreateHeap(); + /* 80D1FD44 */ void create(); + /* 80D1FFA4 */ void Execute(f32 (**)[3][4]); + /* 80D200B4 */ void Draw(); + /* 80D20180 */ void Delete(); +private: + /* 0x568 */ u8 field_0x568[0x5fc - 0x568]; +}; +STATIC_ASSERT(sizeof(daTwGate_c) == 0x5fc); + +class daTwGate_HIO_c { +public: + /* 80D1FAAC */ daTwGate_HIO_c(); + /* 80D2024C */ ~daTwGate_HIO_c(); +}; #endif /* D_A_OBJ_TWGATE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_udoor/d_a_obj_udoor.h b/include/rel/d/a/obj/d_a_obj_udoor/d_a_obj_udoor.h index 5ff475c072d..a6ac5259ac2 100644 --- a/include/rel/d/a/obj/d_a_obj_udoor/d_a_obj_udoor.h +++ b/include/rel/d/a/obj/d_a_obj_udoor/d_a_obj_udoor.h @@ -1,5 +1,21 @@ #ifndef D_A_OBJ_UDOOR_H #define D_A_OBJ_UDOOR_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class obj_udoor_class + * @brief Stable Door + * + * @details + * + */ +class obj_udoor_class : public fopAc_ac_c { +private: + /* 0x568 */ u8 field_0x568[0x754 - 0x568]; +}; +STATIC_ASSERT(sizeof(obj_udoor_class) == 0x754); + #endif /* D_A_OBJ_UDOOR_H */ diff --git a/include/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.h b/include/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.h index 3a2b658320f..6bf2ea6114a 100644 --- a/include/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.h +++ b/include/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.h @@ -5,6 +5,14 @@ class dBgW; +/** + * @ingroup actors-objects + * @class obj_usaku_class + * @brief Horse Fence + * + * @details + * + */ class obj_usaku_class : public fopAc_ac_c { public: /* 0x568 */ request_of_phase_process_class mPhase; @@ -14,5 +22,6 @@ class obj_usaku_class : public fopAc_ac_c { /* 0x580 */ Mtx mBgMtx; /* 0x5B0 */ dBgW* mpBgW; }; +STATIC_ASSERT(sizeof(obj_usaku_class) == 0x5B4); #endif /* D_A_OBJ_USAKU_H */ diff --git a/include/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.h b/include/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.h index 620fbaf4761..4078fe8db53 100644 --- a/include/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.h +++ b/include/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.h @@ -3,6 +3,14 @@ #include "d/com/d_com_inf_game.h" +/** + * @ingroup actors-objects + * @class daObjVGnd_c + * @brief Volcano Ground + * + * @details + * + */ class daObjVGnd_c : public fopAc_ac_c { public: /* 80D213F8 */ void initBaseMtx(); @@ -16,10 +24,11 @@ class daObjVGnd_c : public fopAc_ac_c { u32 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); } +private: /* 0x568 */ request_of_phase_process_class mPhaseReq; /* 0x570 */ J3DModel* mpModel; /* 0x574 */ mDoExt_btkAnm* mpBtk; /* 0x578 */ mDoExt_brkAnm* mpBrk; -}; // Size: 0x57C - +}; +STATIC_ASSERT(sizeof(daObjVGnd_c) == 0x57C); #endif /* D_A_OBJ_VGROUND_H */ diff --git a/include/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.h b/include/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.h index 6fcaead2f6c..d18d19dc9b1 100644 --- a/include/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.h +++ b/include/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.h @@ -1,5 +1,140 @@ #ifndef D_A_OBJ_VOLCBALL_H #define D_A_OBJ_VOLCBALL_H +#include "f_op/f_op_actor_mng.h" +#include "d/event/d_event_lib.h" +#include "d/cc/d_cc_d.h" +#include "d/bg/d_bg_s_acch.h" +#include "d/particle/d_particle.h" + +/** + * @ingroup actors-objects + * @class daObjVolcBall_c + * @brief Volcano Ball + * + * @details + * + */ +class daObjVolcBall_c : public fopAc_ac_c, public dEvLib_callback_c { +public: + enum mode_e { + /* 0 */ MODE_PLAYER_WAIT, + /* 1 */ MODE_SWITCH_WAIT, + /* 2 */ MODE_STOP, + /* 3 */ MODE_QUAKE, + /* 4 */ MODE_ERUPT, + /* 5 */ MODE_END, + }; + + struct vball_s { + /* 80D21FA8 */ ~vball_s(); + /* 80D2214C */ vball_s(); + + /* 0x000 */ J3DModel* mpModel; + /* 0x004 */ cXyz field_0x4; + /* 0x010 */ cXyz field_0x10; + /* 0x01C */ cXyz field_0x1c; + /* 0x028 */ cXyz field_0x28; + /* 0x034 */ csXyz field_0x34; + /* 0x03C */ cXyz field_0x3c; + /* 0x048 */ f32 field_0x48; + /* 0x04C */ f32 field_0x4c; + /* 0x050 */ f32 field_0x50; + /* 0x054 */ dBgS_ObjAcch mAcch; + /* 0x22C */ dCcD_Sph mSphCc; + /* 0x364 */ cXyz field_0x364; + /* 0x370 */ u32 field_0x370; + /* 0x374 */ s16 field_0x374; + /* 0x376 */ u8 field_0x376; + /* 0x378 */ csXyz field_0x378; + /* 0x37E */ u8 field_0x37E[0x0390 - 0x037E]; + /* 0x390 */ dPa_followEcallBack field_0x390[4]; + }; + + class volc_param_c { + public: + /* 0x00 */ f32 mGravity; + /* 0x04 */ f32 mMaxFallSpeed; + /* 0x08 */ f32 mBallSpeedH; + /* 0x0C */ f32 mBallSetShortRange; + /* 0x10 */ f32 mBallSetRandom; + /* 0x14 */ f32 mNormalScale; + /* 0x18 */ f32 mScaleRandValue; + /* 0x1C */ f32 mNormalInterval; + /* 0x20 */ f32 mRandInterval; + /* 0x24 */ f32 mNormalWaitTime; + /* 0x28 */ f32 mRandWaitTime; + /* 0x2C */ f32 mNormalWarningTime; + /* 0x30 */ f32 mRandWarningTime; + /* 0x34 */ f32 mNormalEruptTime; + /* 0x38 */ f32 mRandEruptTime; + /* 0x3C */ f32 mSearchBallFreq; + /* 0x40 */ f32 mSearchBallBaseScale; + /* 0x44 */ f32 mSearchBallRandScale; + /* 0x48 */ f32 mSearchBallSetHeight; + /* 0x4C */ f32 mSearchBallShadowIntensity; + /* 0x50 */ u8 mSearchBallCreateTime; + /* 0x51 */ u8 mPlayerSearchTime; + }; + + daObjVolcBall_c() : dEvLib_callback_c(this) {} + + /* 80D21B18 */ volc_param_c* getData(); + /* 80D21BA0 */ void initBaseMtx(); + /* 80D21BC0 */ void setBaseMtx(); + /* 80D21C40 */ int Create(); + /* 80D21D80 */ int CreateHeap(); + /* 80D21E28 */ int create(); + /* 80D22424 */ int execute(); + /* 80D22484 */ void action(); + /* 80D22570 */ void initActionPlayerWait(); + /* 80D2257C */ void initActionWarning(); + /* 80D225A4 */ void initActionSwWait(); + /* 80D225B0 */ void actionPlayerWait(); + /* 80D2267C */ void actionSwWait(); + /* 80D22724 */ void actionStop(); + /* 80D227E4 */ void actionWarning(); + /* 80D22944 */ void actionEruption(); + /* 80D22C6C */ void initActionEnd(); + /* 80D22CD4 */ void actionEnd(); + /* 80D22E24 */ void setEruptEffect(int); + /* 80D22ED4 */ void setFallEffect(int); + /* 80D22FCC */ void endFallEffect(int); + /* 80D23034 */ bool createSearchBall(); + /* 80D23188 */ bool createNormalBall(); + /* 80D23438 */ int executeBall(); + /* 80D23868 */ void startQuake(); + /* 80D23904 */ int draw(); + /* 80D23A0C */ int _delete(); + + /* 80D23B24 */ virtual ~daObjVolcBall_c(); + /* 80D22DDC */ virtual BOOL eventStart(); + + u8 getSwBit() { return fopAcM_GetParamBit(this, 0, 8); } + u8 getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); } + u8 checkBigVolc() { return fopAcM_GetParamBit(this, 0x1F, 1); } + u8 getEvNo() { return fopAcM_GetParamBit(this, 0x10, 8); } + + void setAction(u8 i_action) { mMode = i_action; } + +private: + /* 0x057C */ request_of_phase_process_class mPhase; + /* 0x0584 */ dBgS_AcchCir mAcchCir; + /* 0x05C4 */ dCcD_Stts mCcStts; + /* 0x0600 */ u8 mIsBigVolc; + /* 0x0601 */ u8 mMode; + /* 0x0602 */ u8 mNormalBallCreateTimer; + /* 0x0603 */ u8 field_0x603; + /* 0x0604 */ u32 mTime; + /* 0x0608 */ u32 mSearchBallCreateTimer; + /* 0x060C */ vball_s mBall[9]; + /* 0x28EC */ Mtx field_0x28ec; + /* 0x291C */ f32 field_0x291c; + /* 0x2920 */ u32 mBigVolcActorID; + /* 0x2924 */ u8 field_0x2924; + /* 0x2925 */ u8 field_0x2925; + /* 0x2926 */ u8 field_0x2926; +}; +STATIC_ASSERT(sizeof(daObjVolcBall_c) == 0x2928); #endif /* D_A_OBJ_VOLCBALL_H */ diff --git a/include/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.h b/include/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.h index c66639dc1a4..e874e621a55 100644 --- a/include/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.h +++ b/include/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.h @@ -1,5 +1,69 @@ #ifndef D_A_OBJ_VOLCBOM_H #define D_A_OBJ_VOLCBOM_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjVolcBom_c + * @brief Volcano Bomb? + * + * @details + * + */ +class daObjVolcBom_c : public fopAc_ac_c { +public: + /* 80D241E0 */ void initBaseMtx(); + /* 80D24238 */ void setBaseMtx(); + /* 80D242A8 */ void Create(); + /* 80D244E0 */ void CreateHeap(); + /* 80D248F4 */ void create1st(); + /* 80D249D0 */ void Execute(f32 (**)[3][4]); + /* 80D24A2C */ void mode_proc_call(); + /* 80D24B18 */ void init_modeWaitAppear(); + /* 80D24B6C */ void modeWaitAppear(); + /* 80D24D80 */ void init_modeFall(); + /* 80D24E50 */ void modeFall(); + /* 80D25024 */ void init_modeWaitEndFallDemo(); + /* 80D25038 */ void modeWaitEndFallDemo(); + /* 80D25094 */ void init_modeWait(); + /* 80D25100 */ void modeWait(); + /* 80D25178 */ void clrDzb(); + /* 80D251CC */ void setDzb(); + /* 80D25224 */ void appear(); + /* 80D25230 */ void disappear(); + /* 80D2523C */ void setSmoke(); + /* 80D252C8 */ void checkTalkDistance(); + /* 80D25364 */ void calcMidnaWaitPos(); + /* 80D253FC */ void setSrcEffect(); + /* 80D25528 */ void setBindEffect(); + /* 80D255F4 */ void followBindEffect(); + /* 80D25664 */ void endBindEffect(); + /* 80D256B8 */ void followSrcEffect(); + /* 80D25758 */ void endSrcEffect(); + /* 80D257E4 */ void event_proc_call(); + /* 80D25914 */ void orderZHintEvent(); + /* 80D25A08 */ void actionWait(); + /* 80D25B04 */ void actionOrderEvent(); + /* 80D25CA0 */ void actionOrderATalkEvent(); + /* 80D25DEC */ void actionTalkEvent(); + /* 80D25E78 */ void actionWarpEvent(); + /* 80D25EE4 */ void actionDead(); + /* 80D25EE8 */ void demoProc(); + /* 80D26468 */ void calcObjPos(); + /* 80D264E8 */ void Draw(); + /* 80D266FC */ void Delete(); + + void startFall() { field_0x95f = 1; } + void startSearch() { field_0x960 = 1; } + +private: + /* 0x568 */ u8 field_0x568[0x95F - 0x568]; + /* 0x95F */ u8 field_0x95f; + /* 0x960 */ u8 field_0x960; + /* 0x961 */ u8 field_0x961[0xA1C - 0x961]; +}; +STATIC_ASSERT(sizeof(daObjVolcBom_c) == 0xa1c); + #endif /* D_A_OBJ_VOLCBOM_H */ diff --git a/include/rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.h b/include/rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.h index 90928ff3e7d..b9114614412 100644 --- a/include/rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.h +++ b/include/rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.h @@ -1,6 +1,56 @@ #ifndef D_A_OBJ_WARP_KBRG_H #define D_A_OBJ_WARP_KBRG_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjWarpKBrg_c + * @brief Warp K Bridge (Kakariko Gorge Bridge?) + * + * @details + * + */ +class daObjWarpKBrg_c : public fopAc_ac_c { +public: + /* 80D26FA8 */ void initBaseMtx(); + /* 80D27008 */ void setBaseMtx(); + /* 80D270C4 */ void Create(); + /* 80D27300 */ void CreateHeap(); + /* 80D276B4 */ void create1st(); + /* 80D2781C */ void Execute(f32 (**)[3][4]); + /* 80D27890 */ void event_proc_call(); + /* 80D27A38 */ void orderZHintEvent(); + /* 80D27B2C */ void actionWait(); + /* 80D27C6C */ void actionOrderEvent(); + /* 80D27E08 */ void actionWaitWarpEvent(); + /* 80D27ED0 */ void actionOrderATalkEvent(); + /* 80D28040 */ void actionTalkEvent(); + /* 80D280CC */ void actionWarpEvent(); + /* 80D28144 */ void actionDead(); + /* 80D28148 */ void actionWait2(); + /* 80D2814C */ void actionOrderEvent2(); + /* 80D281E4 */ void actionWarpEvent2(); + /* 80D28248 */ void actionDead2(); + /* 80D2824C */ void demoProc(); + /* 80D28A50 */ void calcObjPos(); + /* 80D28AE0 */ void checkTalkDistance(); + /* 80D28B7C */ void calcMidnaWaitPos(); + /* 80D28C10 */ void setBindEffect(); + /* 80D28CDC */ void followBindEffect(); + /* 80D28D4C */ void setSrcEffect(); + /* 80D28E9C */ void setDstEffect(); + /* 80D28FEC */ void followSrcEffect(); + /* 80D290A8 */ void followDstEffect(); + /* 80D29158 */ void endSrcEffect(); + /* 80D291FC */ void endDstEffect(); + /* 80D292A0 */ void Draw(); + /* 80D29448 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x69c - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjWarpKBrg_c) == 0x69c); + #endif /* D_A_OBJ_WARP_KBRG_H */ diff --git a/include/rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg.h b/include/rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg.h index 636cdd3c7c5..d5536b17f07 100644 --- a/include/rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg.h +++ b/include/rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg.h @@ -1,6 +1,42 @@ #ifndef D_A_OBJ_WARP_OBRG_H #define D_A_OBJ_WARP_OBRG_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjWarpOBrg_c + * @brief Warp O Bridge (Eldin Bridge?) + * + * @details + * + */ +class daObjWarpOBrg_c : public fopAc_ac_c { +public: + /* 80D299B8 */ void initBaseMtx(); + /* 80D29A00 */ void setBaseMtx(); + /* 80D29ACC */ void Create(); + /* 80D29BB4 */ void CreateHeap(); + /* 80D29E7C */ void create1st(); + /* 80D2A008 */ void Execute(f32 (**)[3][4]); + /* 80D2A04C */ void event_proc_call(); + /* 80D2A194 */ void actionWait(); + /* 80D2A4CC */ void actionOrderEvent(); + /* 80D2A740 */ void actionTalkEvent(); + /* 80D2A7C4 */ void actionWarpEvent(); + /* 80D2A93C */ void actionOrderEventDst(); + /* 80D2A9E4 */ void actionWarpEventDst(); + /* 80D2AA30 */ void actionDead(); + /* 80D2AA34 */ void demoProc(); + /* 80D2B3BC */ void checkTalkDistance(); + /* 80D2B534 */ void calcMidnaWaitPos(); + /* 80D2B5C8 */ void Draw(); + /* 80D2B6C0 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x640 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjWarpOBrg_c) == 0x640); + #endif /* D_A_OBJ_WARP_OBRG_H */ diff --git a/include/rel/d/a/obj/d_a_obj_waterGate/d_a_obj_waterGate.h b/include/rel/d/a/obj/d_a_obj_waterGate/d_a_obj_waterGate.h index 7d3d909b2d4..9f3d4475f6b 100644 --- a/include/rel/d/a/obj/d_a_obj_waterGate/d_a_obj_waterGate.h +++ b/include/rel/d/a/obj/d_a_obj_waterGate/d_a_obj_waterGate.h @@ -1,6 +1,44 @@ #ifndef D_A_OBJ_WATERGATE_H #define D_A_OBJ_WATERGATE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daWtGate_c + * @brief Water Gate + * + * @details + * + */ +class daWtGate_c : public fopAc_ac_c { +public: + /* 80D2BC0C */ void setBaseMtx(); + /* 80D2BC94 */ void CreateHeap(); + /* 80D2BD00 */ void create(); + /* 80D2BE7C */ void Execute(f32 (**)[3][4]); + /* 80D2BECC */ void move(); + /* 80D2BF88 */ void init_modeWait(); + /* 80D2BF94 */ void modeWait(); + /* 80D2C010 */ void init_modeOpen(); + /* 80D2C02C */ void modeOpen(); + /* 80D2C134 */ void init_modeClose(); + /* 80D2C150 */ void modeClose(); + /* 80D2C250 */ void init_modeEnd(); + /* 80D2C25C */ void modeEnd(); + /* 80D2C260 */ void Draw(); + /* 80D2C304 */ void Delete(); + +private: + /* 0x568 */ u8 field_0x568[0x5bc - 0x568]; +}; +STATIC_ASSERT(sizeof(daWtGate_c) == 0x5bc); + +class daWtGate_HIO_c { +public: + /* 80D2BB8C */ daWtGate_HIO_c(); + /* 80D2C3C0 */ ~daWtGate_HIO_c(); +}; + #endif /* D_A_OBJ_WATERGATE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar.h b/include/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar.h index 1b5422f06b8..2e7534b11bf 100644 --- a/include/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar.h +++ b/include/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar.h @@ -1,6 +1,68 @@ #ifndef D_A_OBJ_WATERPILLAR_H #define D_A_OBJ_WATERPILLAR_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daWtPillar_c + * @brief Water Column + * + * @details + * + */ +class daWtPillar_c : public fopAc_ac_c { +public: + /* 80D2C7B0 */ void setBaseMtx(); + /* 80D2C838 */ void createHeapCallBack(fopAc_ac_c*); + /* 80D2C858 */ void CreateHeap(); + /* 80D2C960 */ void create(); + /* 80D2CC0C */ void execute(); + /* 80D2CE4C */ void actionMain(); + /* 80D2CF98 */ void effectSet(); + /* 80D2D278 */ void effectSet2(); + /* 80D2D3FC */ void actionSwWaitInit(); + /* 80D2D408 */ void actionSwWait(); + /* 80D2D488 */ void eventStart(); + /* 80D2D4AC */ void actionWaitInit(); + /* 80D2D588 */ void actionWait(); + /* 80D2D5C0 */ void actionUpFirstInit(); + /* 80D2D6C4 */ void actionUpFirst(); + /* 80D2D73C */ void actionUpFirstWaitInit(); + /* 80D2D780 */ void actionUpFirstWait(); + /* 80D2D7B8 */ void actionUpInit(); + /* 80D2D850 */ void actionUp(); + /* 80D2D95C */ void actionUpWaitInit(); + /* 80D2D9A0 */ void actionUpWait(); + /* 80D2DA58 */ void actionDownInit(); + /* 80D2DA78 */ void actionDown(); + /* 80D2DB68 */ void actionRockWaitInit(); + /* 80D2DB74 */ void actionRockWait(); + /* 80D2DC20 */ void actionRockOnInit(); + /* 80D2DC2C */ void actionRockOn(); + /* 80D2DD0C */ void actionEndInit(); + /* 80D2DD18 */ void actionEnd(); + /* 80D2DDB0 */ void getPillarHeight(); + /* 80D2DDB8 */ void draw(); + /* 80D2DE84 */ void _delete(); + /* 80D2E054 */ daWtPillar_c(); + /* 80D2E430 */ ~daWtPillar_c(); + + static u8 const mCcDObjInfo[48]; + static u8 const mCcDObjCoInfo[48]; + static u8 mCcDCps[76]; + static u8 mCcDCyl[68]; + +private: + /* 0x568 */ u8 field_0x568[0xb7c - 0x568]; +}; +STATIC_ASSERT(sizeof(daWtPillar_c) == 0xb7c); + +class daWtPillar_HIO_c { +public: + /* 80D2C6CC */ daWtPillar_HIO_c(); + /* 80D2DF34 */ ~daWtPillar_HIO_c(); +}; + #endif /* D_A_OBJ_WATERPILLAR_H */ diff --git a/include/rel/d/a/obj/d_a_obj_waterfall/d_a_obj_waterfall.h b/include/rel/d/a/obj/d_a_obj_waterfall/d_a_obj_waterfall.h index aceb02aa1b1..17af9916b03 100644 --- a/include/rel/d/a/obj/d_a_obj_waterfall/d_a_obj_waterfall.h +++ b/include/rel/d/a/obj/d_a_obj_waterfall/d_a_obj_waterfall.h @@ -1,5 +1,33 @@ #ifndef D_A_OBJ_WATERFALL_H #define D_A_OBJ_WATERFALL_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjWaterFall_c + * @brief Waterfall + * + * @details + * + */ +class daObjWaterFall_c : public fopAc_ac_c { +public: + /* 80D2ED14 */ void search_bomb(); + /* 80D2F034 */ void search_arrow(); + /* 80D2F324 */ void initBaseMtx(); + /* 80D2F344 */ void setBaseMtx(); + /* 80D2F39C */ void Create(); + /* 80D2F5A0 */ void create(); + /* 80D2F984 */ void execute(); + /* 80D2FA6C */ void push_player(); + /* 80D2FC94 */ bool draw(); + /* 80D2FC9C */ void _delete(); + +private: + /* 0x568 */ u8 field_0x568[0x9cc - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjWaterFall_c) == 0x9cc); + #endif /* D_A_OBJ_WATERFALL_H */ diff --git a/include/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.h b/include/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.h index 17f0d5760a5..4ebf2dfbbab 100644 --- a/include/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.h +++ b/include/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.h @@ -22,6 +22,14 @@ class daObjWchain_shape_c { }; #endif +/** + * @ingroup actors-objects + * @class daObjWchain_c + * @brief Wolf Chain + * + * @details + * + */ class daObjWchain_c : public fopAc_ac_c { public: /* 80D2FEF8 */ int createHeap(); @@ -56,7 +64,8 @@ class daObjWchain_c : public fopAc_ac_c { void onEndFlg() { mEnd = true; } bool getEndFlg() { return mEnd; } void onNowSwitchFlg() { mDown = mNowSwitch = true; } - + +private: /* 0x568 */ request_of_phase_process_class mPhaseReq; /* 0x570 */ J3DModel* mpHandleModel; /* 0x574 */ J3DModelData* mpChainModelData; @@ -82,7 +91,6 @@ class daObjWchain_c : public fopAc_ac_c { /* 0x7AC */ f32 mRealRoofY; /* 0x7B0 */ cXyz mRoofPos; }; - STATIC_ASSERT(sizeof(daObjWchain_c) == 0x7BC); #endif /* D_A_OBJ_WCHAIN_H */ diff --git a/include/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick.h b/include/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick.h index 3f067dcc116..d23b6c4aa87 100644 --- a/include/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick.h +++ b/include/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick.h @@ -1,6 +1,56 @@ #ifndef D_A_OBJ_WDSTICK_H #define D_A_OBJ_WDSTICK_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daWdStick_c + * @brief Wooden Stick + * + * @details + * + */ +class daWdStick_c : public fopAc_ac_c { +public: + /* 80D31BD0 */ void setBaseMtx(); + /* 80D31C58 */ void CreateHeap(); + /* 80D31CC4 */ void create(); + /* 80D32168 */ void createHeapCallBack(fopAc_ac_c*); + /* 80D32194 */ void lightInit(); + /* 80D32198 */ void setLight(); + /* 80D3219C */ void setFire(); + /* 80D3269C */ void Execute(); + /* 80D32DB4 */ void bgCheck(); + /* 80D33348 */ void setBoundSe(); + /* 80D333F4 */ void mode_proc_call(); + /* 80D3350C */ void mode_init_wait(); + /* 80D3353C */ void mode_proc_wait(); + /* 80D33588 */ void mode_init_carry(); + /* 80D335AC */ void mode_proc_carry(); + /* 80D3386C */ void mode_init_drop(); + /* 80D33890 */ void mode_proc_drop(); + /* 80D338DC */ void mode_init_roll(); + /* 80D338F4 */ void mode_proc_roll(); + /* 80D33D44 */ void chkWaterLineIn(); + /* 80D33D68 */ void mode_init_sink(); + /* 80D33D8C */ void mode_proc_sink(); + /* 80D33EB0 */ void Draw(); + /* 80D33F14 */ void Delete(); + + static u8 const mCcDObjInfo[48]; + static u8 mCcDSph[64]; + +private: + /* 0x568 */ u8 field_0x568[0xaf8 - 0x568]; +}; +STATIC_ASSERT(sizeof(daWdStick_c) == 0xaf8); + +class daWdStick_HIO_c { +public: + /* 80D31B4C */ daWdStick_HIO_c(); + /* 80D34030 */ ~daWdStick_HIO_c(); +}; + #endif /* D_A_OBJ_WDSTICK_H */ diff --git a/include/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.h b/include/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.h index 0bebd778e98..83aaf7ec19d 100644 --- a/include/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.h +++ b/include/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.h @@ -3,6 +3,14 @@ #include "d/com/d_com_inf_game.h" +/** + * @ingroup actors-objects + * @class obj_web0_class + * @brief Wall Web + * + * @details + * + */ class obj_web0_class : public fopAc_ac_c { public: /* 0x568 */ request_of_phase_process_class mPhase; @@ -22,7 +30,8 @@ class obj_web0_class : public fopAc_ac_c { /* 0x600 */ dCcD_Sph mSphCc; /* 0x738 */ u8 mDeleteTimer; /* 0x739 */ u8 field_0x739; -}; // Size: 0x73C +}; +STATIC_ASSERT(sizeof(obj_web0_class) == 0x73C); class daObj_Web0_HIO_c { public: diff --git a/include/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.h b/include/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.h index 54f73702cce..fff17277ad0 100644 --- a/include/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.h +++ b/include/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.h @@ -3,6 +3,14 @@ #include "d/com/d_com_inf_game.h" +/** + * @ingroup actors-objects + * @class obj_web1_class + * @brief Floor Web + * + * @details + * + */ class obj_web1_class : public fopAc_ac_c { public: /* 0x568 */ request_of_phase_process_class mPhase; @@ -27,7 +35,8 @@ class obj_web1_class : public fopAc_ac_c { /* 0x5F4 */ dCcD_Stts mStts; /* 0x630 */ dCcD_Cyl mCylCc; /* 0x76C */ u8 field_0x76c; -}; // Size: 0x770 +}; +STATIC_ASSERT(sizeof(obj_web1_class) == 0x770); class daObj_Web1_HIO_c { public: diff --git a/include/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.h b/include/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.h index f171efe9ee8..88b8e865326 100644 --- a/include/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.h +++ b/include/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.h @@ -4,6 +4,14 @@ #include "d/bg/d_bg_s_movebg_actor.h" #include "d/com/d_com_inf_game.h" +/** + * @ingroup actors-objects + * @class daObjWCover_c + * @brief Graveyard Well Cover + * + * @details + * + */ class daObjWCover_c : public dBgS_MoveBgActor { public: /* 80D36298 */ void initBaseMtx(); @@ -21,10 +29,12 @@ class daObjWCover_c : public dBgS_MoveBgActor { u8 getSwNo() { return fopAcM_GetParam(this); } +private: /* 0x5A0 */ request_of_phase_process_class mPhaseReq; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ u8 field_0x5AC[0x5B0 - 0x5AC]; /* 0x5B0 */ u8 field_0x5b0; -}; // Size: 0x5B4 +}; +STATIC_ASSERT(sizeof(daObjWCover_c) == 0x5B4); #endif /* D_A_OBJ_WELL_COVER_H */ diff --git a/include/rel/d/a/obj/d_a_obj_wflag/d_a_obj_wflag.h b/include/rel/d/a/obj/d_a_obj_wflag/d_a_obj_wflag.h index 302d0eaf421..23d752004c6 100644 --- a/include/rel/d/a/obj/d_a_obj_wflag/d_a_obj_wflag.h +++ b/include/rel/d/a/obj/d_a_obj_wflag/d_a_obj_wflag.h @@ -1,8 +1,7 @@ #ifndef D_A_OBJ_WFLAG_H #define D_A_OBJ_WFLAG_H -#include "f_op/f_op_actor.h" -#include "SSystem/SComponent/c_phase.h" +#include "f_op/f_op_actor_mng.h" struct wf_tail_s { /* 80D37720 */ ~wf_tail_s() {} @@ -17,7 +16,16 @@ struct wf_tail_s { /* 0x2A8 */ u32 field_0x2a8; }; -struct obj_wflag_class : public fopAc_ac_c { +/** + * @ingroup actors-objects + * @class obj_wflag_class + * @brief ??? + * + * @details + * + */ +class obj_wflag_class : public fopAc_ac_c { +public: /* 0x568 */ request_of_phase_process_class mPhaseReq; /* 0x570 */ J3DModel* mpModel; /* 0x574 */ mDoExt_McaMorf* mMorf; @@ -31,5 +39,6 @@ struct obj_wflag_class : public fopAc_ac_c { /* 0x836 */ s16 field_0x836; /* 0x838 */ u32 field_0x838; }; +STATIC_ASSERT(sizeof(obj_wflag_class) == 0x83C); #endif /* D_A_OBJ_WFLAG_H */ diff --git a/include/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.h b/include/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.h index 7c1d81d750c..b955c9fb599 100644 --- a/include/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.h +++ b/include/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.h @@ -4,6 +4,14 @@ #include "d/bg/d_bg_w.h" #include "f_op/f_op_actor_mng.h" +/** + * @ingroup actors-objects + * @class daWindStone_c + * @brief Howling Stone (Hole) + * + * @details + * + */ class daWindStone_c : public fopAc_ac_c, public request_of_phase_process_class { public: /* 80D37A18 */ daWindStone_c(); @@ -28,6 +36,7 @@ class daWindStone_c : public fopAc_ac_c, public request_of_phase_process_class { u32 getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); } u32 getDelEveFlgId() { return fopAcM_GetParamBit(this, 0x10, 0x10); } +private: /* 0x574 */ cBgS_PolyInfo mPolyInfo; /* 0x584 */ J3DModel* mpModel; /* 0x588 */ dBgW* mpBgW; @@ -36,5 +45,6 @@ class daWindStone_c : public fopAc_ac_c, public request_of_phase_process_class { /* 0x5C0 */ u32 field_0x5c0; /* 0x5C4 */ u8 field_0x5c4; }; +STATIC_ASSERT(sizeof(daWindStone_c) == 0x5C8); #endif /* D_A_OBJ_WIND_STONE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_window/d_a_obj_window.h b/include/rel/d/a/obj/d_a_obj_window/d_a_obj_window.h index 7608d00dfac..5450244bae8 100644 --- a/include/rel/d/a/obj/d_a_obj_window/d_a_obj_window.h +++ b/include/rel/d/a/obj/d_a_obj_window/d_a_obj_window.h @@ -5,6 +5,14 @@ #include "d/bg/d_bg_s_movebg_actor.h" #include "d/cc/d_cc_d.h" +/** + * @ingroup actors-objects + * @class daObjWindow_c + * @brief Destructable Kakariko Village Window + * + * @details + * + */ class daObjWindow_c : public dBgS_MoveBgActor { public: /* 80D38758 */ void initBaseMtx(); @@ -19,6 +27,7 @@ class daObjWindow_c : public dBgS_MoveBgActor { u8 getType() { return fopAcM_GetParamBit(this, 0, 8); } u8 getLightInf() { return fopAcM_GetParamBit(this, 8, 8); } +private: /* 0x5A0 */ request_of_phase_process_class mPhaseReq; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ mDoExt_bckAnm* mpBckAnm; diff --git a/include/rel/d/a/obj/d_a_obj_wood_pendulum/d_a_obj_wood_pendulum.h b/include/rel/d/a/obj/d_a_obj_wood_pendulum/d_a_obj_wood_pendulum.h index d2214e5d85e..c409f378c8f 100644 --- a/include/rel/d/a/obj/d_a_obj_wood_pendulum/d_a_obj_wood_pendulum.h +++ b/include/rel/d/a/obj/d_a_obj_wood_pendulum/d_a_obj_wood_pendulum.h @@ -3,5 +3,42 @@ #include "d/com/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjWPndlm_c + * @brief Wooden Pendulum + * + * @details + * + */ +class daObjWPndlm_c : public fopAc_ac_c { +public: +public: + /* 80D39418 */ void initBaseMtx(); + /* 80D39454 */ void setBaseMtx(); + /* 80D394CC */ int Create(); + /* 80D395C8 */ int CreateHeap(); + /* 80D39638 */ int create(); + /* 80D39978 */ int execute(); + /* 80D39B68 */ int draw(); + /* 80D39BCC */ int _delete(); + + u32 getArg0() { return fopAcM_GetParamBit(this, 0, 8); } + u32 getArg1() { return fopAcM_GetParamBit(this, 8, 8); } + +private: + /* 0x568 */ request_of_phase_process_class mPhaseReq; + /* 0x570 */ J3DModel* mpModel; + /* 0x574 */ dCcD_Stts mStts; + /* 0x5B0 */ dCcD_Sph mSph; + /* 0x6E8 */ dCcD_Sph field_0x6e8[2]; + /* 0x958 */ s16 field_0x958; + /* 0x95A */ s16 field_0x95a; + /* 0x95C */ s16 field_0x95c; +}; +STATIC_ASSERT(sizeof(daObjWPndlm_c) == 0x960); + #endif /* D_A_OBJ_WOOD_PENDULUM_H */ diff --git a/include/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue.h b/include/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue.h index ff3eee1d441..63b02e5434c 100644 --- a/include/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue.h +++ b/include/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue.h @@ -1,5 +1,45 @@ #ifndef D_A_OBJ_WOOD_STATUE_H #define D_A_OBJ_WOOD_STATUE_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjWStatue_c + * @brief Wooden Statue + * + * @details + * + */ +class daObjWStatue_c : public fopAc_ac_c { +public: + /* 80D3A268 */ void initBaseMtx(); + /* 80D3A2A4 */ void setBaseMtx(); + /* 80D3A2F0 */ void Create(); + /* 80D3A474 */ bool __CreateHeap(); + /* 80D3A47C */ void create(); + /* 80D3A8E8 */ void bg_check(); + /* 80D3AA3C */ void actionWaitInit(); + /* 80D3AA80 */ void actionWait(); + /* 80D3AB9C */ void initActionOrderGetDemo(); + /* 80D3AC64 */ void actionOrderGetDemo(); + /* 80D3ACAC */ void actionGetDemo(); + /* 80D3AD30 */ void actionInitSwOnWait(); + /* 80D3AD88 */ void actionSwOnWait(); + /* 80D3AE7C */ void actionInitBoomerangCarry(); + /* 80D3AF5C */ void actionBoomerangCarry(); + /* 80D3AFC0 */ void demoProc(); + /* 80D3B164 */ void effectSet(); + /* 80D3B250 */ void effectStop(); + /* 80D3B2A0 */ void execute(); + /* 80D3B428 */ void draw(); + /* 80D3B47C */ void setListStart(); + /* 80D3B480 */ void _delete(); + +private: + /* 0x568 */ u8 field_0x568[0x974 - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjWStatue_c) == 0x974); + #endif /* D_A_OBJ_WOOD_STATUE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_wsword/d_a_obj_wsword.h b/include/rel/d/a/obj/d_a_obj_wsword/d_a_obj_wsword.h index fb6f1d63830..fc07623fa5a 100644 --- a/include/rel/d/a/obj/d_a_obj_wsword/d_a_obj_wsword.h +++ b/include/rel/d/a/obj/d_a_obj_wsword/d_a_obj_wsword.h @@ -6,6 +6,14 @@ #include "d/bg/d_bg_s_acch.h" #include "d/cc/d_cc_d.h" +/** + * @ingroup actors-objects + * @class daObjWSword_c + * @brief Wooden Sword + * + * @details + * + */ class daObjWSword_c : public fopAc_ac_c { public: /* 80D3B998 */ void initBaseMtx(); @@ -17,6 +25,7 @@ class daObjWSword_c : public fopAc_ac_c { /* 80D3BDF0 */ int draw(); /* 80D3BE54 */ int _delete(); +private: /* 0x568 */ request_of_phase_process_class mPhaseReq; /* 0x570 */ J3DModel* mpModel; /* 0x574 */ dBgS_ObjAcch mAcch; diff --git a/include/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag.h b/include/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag.h index 8447ccbd4de..e0e24cf3894 100644 --- a/include/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag.h +++ b/include/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag.h @@ -1,6 +1,52 @@ #ifndef D_A_OBJ_YEL_BAG_H #define D_A_OBJ_YEL_BAG_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObj_YBag_c + * @brief Ilia's Bag + * + * @details + * + */ +class daObj_YBag_c : public fopAc_ac_c { +public: + /* 80D3C0EC */ daObj_YBag_c(); + /* 80D3C408 */ ~daObj_YBag_c(); + /* 80D3C610 */ void create(); + /* 80D3C898 */ void CreateHeap(); + /* 80D3C93C */ void Delete(); + /* 80D3C970 */ void Execute(); + /* 80D3D32C */ void Draw(); + /* 80D3D438 */ void createHeapCallBack(fopAc_ac_c*); + /* 80D3D458 */ bool getTypeFromParam(); + /* 80D3D460 */ bool isDelete(); + /* 80D3D468 */ void setEnvTevColor(); + /* 80D3D4C4 */ void setRoomNo(); + /* 80D3D508 */ void reset(); + /* 80D3D5C8 */ void setMtx(); + /* 80D3D69C */ void calcRollAngle(s16, int); + /* 80D3D73C */ void getWallAngle(s16, s16*); + /* 80D3D8CC */ void setSmokePrtcl(); + /* 80D3D948 */ void setWaterPrtcl(); + /* 80D3DA70 */ void setHamonPrtcl(); + + static u8 const mCcDObjInfo[48]; + static u8 mCcDCyl[68]; + +private: + /* 0x568 */ u8 field_0x568[0xa3c - 0x568]; +}; +STATIC_ASSERT(sizeof(daObj_YBag_c) == 0xa3c); + +class daObj_YBag_Param_c { +public: + /* 80D3DC20 */ ~daObj_YBag_Param_c(); + + static u8 const m[44]; +}; + #endif /* D_A_OBJ_YEL_BAG_H */ diff --git a/include/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.h b/include/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.h index 4a4159a3528..2e04b3642b0 100644 --- a/include/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.h +++ b/include/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.h @@ -4,6 +4,14 @@ #include "d/cc/d_cc_d.h" #include "f_op/f_op_actor_mng.h" +/** + * @ingroup actors-objects + * @class daObjYobikusa_c + * @brief Hawk Grass + * + * @details + * + */ class daObjYobikusa_c : public fopAc_ac_c { public: enum Mode_e { diff --git a/include/rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.h b/include/rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.h index dc8e1439131..acc6a225e70 100644 --- a/include/rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.h +++ b/include/rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.h @@ -1,5 +1,42 @@ #ifndef D_A_OBJ_YOUSEI_H #define D_A_OBJ_YOUSEI_H +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daObjYOUSEI_c + * @brief Fairy + * + * @details + * + */ +class daObjYOUSEI_c : public fopAc_ac_c { +public: + /* 804CE738 */ void InitCcSph(); + /* 804CE7A4 */ void SetCcSph(); + /* 804CE920 */ void SpeedSet(); + /* 804CE9D0 */ void MoveAction(); + /* 804CEE50 */ void BinAction(); + /* 804CF098 */ void LinkChk(); + /* 804CF6C4 */ void WaitAction(); + /* 804CFCE8 */ void LinkAction(); + /* 804D057C */ void LinkSearch(); + /* 804D065C */ void WayBgCheck(f32, f32, s16); + /* 804D0780 */ void CareAction(); + /* 804D080C */ void CheckGround(); + /* 804D0988 */ void CheckWater(); + /* 804D0AD0 */ void Action(); + /* 804D0CCC */ void ObjHit(); + /* 804D0DF0 */ void Execute(); + /* 804D0F98 */ void Delete(); + /* 804D0FCC */ void setBaseMtx(); + /* 804D111C */ void create(); + +private: + /* 0x568 */ u8 field_0x568[0xa4c - 0x568]; +}; +STATIC_ASSERT(sizeof(daObjYOUSEI_c) == 0xa4c); + #endif /* D_A_OBJ_YOUSEI_H */ diff --git a/include/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h b/include/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h index 6f6e3ae786e..947eafef519 100644 --- a/include/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h +++ b/include/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h @@ -4,6 +4,14 @@ #include "SSystem/SComponent/c_phase.h" #include "f_op/f_op_actor.h" +/** + * @ingroup actors-objects + * @class obj_ystone_class + * @brief ??? (Shadow Stone?) + * + * @details + * + */ class obj_ystone_class : public fopAc_ac_c { public: void setCurrentPos(cXyz i_pos) { @@ -49,5 +57,6 @@ class obj_ystone_class : public fopAc_ac_c { /* 0x59B */ bool field_0x59b; /* 0x59C */ u8 field_0x59c[4]; }; +STATIC_ASSERT(sizeof(obj_ystone_class) == 0x5A0); #endif /* D_A_OBJ_YSTONE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_zcloth/d_a_obj_zcloth.h b/include/rel/d/a/obj/d_a_obj_zcloth/d_a_obj_zcloth.h index 2b91b6ccdf6..fea64fd82fe 100644 --- a/include/rel/d/a/obj/d_a_obj_zcloth/d_a_obj_zcloth.h +++ b/include/rel/d/a/obj/d_a_obj_zcloth/d_a_obj_zcloth.h @@ -3,6 +3,14 @@ #include "d/a/d_a_itembase.h" +/** + * @ingroup actors-objects + * @class daObjZCloth_c + * @brief Zora Armor? + * + * @details + * + */ class daObjZCloth_c : public daItemBase_c { public: /* 80D3EE18 */ void initBaseMtx(); @@ -12,6 +20,7 @@ class daObjZCloth_c : public daItemBase_c { /* 80D3F1AC */ int execute(); /* 80D3F1D0 */ int draw(); /* 80D3F200 */ int _delete(); -}; // Size: 0x92C +}; +STATIC_ASSERT(sizeof(daObjZCloth_c) == 0x92C); #endif /* D_A_OBJ_ZCLOTH_H */ diff --git a/include/rel/d/a/obj/d_a_obj_zdoor/d_a_obj_zdoor.h b/include/rel/d/a/obj/d_a_obj_zdoor/d_a_obj_zdoor.h index 68fef559177..426884370ac 100644 --- a/include/rel/d/a/obj/d_a_obj_zdoor/d_a_obj_zdoor.h +++ b/include/rel/d/a/obj/d_a_obj_zdoor/d_a_obj_zdoor.h @@ -4,5 +4,43 @@ #include "d/bg/d_bg_s_movebg_actor.h" #include "d/com/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" +#include "f_op/f_op_actor_mng.h" + +/** + * @ingroup actors-objects + * @class daZdoor_c + * @brief Zelda Door + * + * @details + * + */ +class daZdoor_c : public dBgS_MoveBgActor { +public: + /* 80D3F65C */ void init_cyl(); + /* 80D3F740 */ void set_cyl(); + /* 80D3F884 */ void setBaseMtx(); + /* 80D3F8F8 */ int Create(); + /* 80D3F970 */ int CreateHeap(); + /* 80D3F9F0 */ int create1st(); + /* 80D3FACC */ int Execute(Mtx**); + /* 80D3FCE8 */ int Draw(); + /* 80D3FD8C */ int Delete(); + + u32 getType() { return fopAcM_GetParamBit(this, 0, 4); } + +private: + /* 0x5A0 */ request_of_phase_process_class mPhaseReq; + /* 0x5A8 */ J3DModel* mpModel; + /* 0x5AC */ dBgS_ObjAcch mObjAcch; + /* 0x784 */ dBgS_AcchCir mAcchCir; + /* 0x7C4 */ dCcD_Stts mStts; + /* 0x800 */ dCcD_Cyl field_0x800[4]; + /* 0xCF0 */ dCcD_Cyl field_0xcf0; + /* 0xE2C */ s16 field_0xe2c; + /* 0xE2E */ s16 field_0xe2e; + /* 0xE30 */ u8 field_0xe30; +}; +STATIC_ASSERT(sizeof(daZdoor_c) == 0xE34); + #endif /* D_A_OBJ_ZDOOR_H */ diff --git a/include/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.h b/include/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.h index 6699964bf25..2def7221c6a 100644 --- a/include/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.h +++ b/include/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.h @@ -6,6 +6,14 @@ #include "d/cc/d_cc_d.h" #include "d/bg/d_bg_s_movebg_actor.h" +/** + * @ingroup actors-objects + * @class daZrTurara_c + * @brief Zora Drop + * + * @details + * + */ class daZrTurara_c : public dBgS_MoveBgActor { public: /* 80D405E4 */ void setBaseMtx(); @@ -21,6 +29,7 @@ class daZrTurara_c : public dBgS_MoveBgActor { /* 80D412B0 */ int Draw(); /* 80D41380 */ int Delete(); +private: /* 0x5A0 */ dCcD_Stts mCcStatus; /* 0x5DC */ dCcD_Cyl mCcCyl; /* 0x718 */ request_of_phase_process_class mPhaseReq; @@ -36,6 +45,7 @@ class daZrTurara_c : public dBgS_MoveBgActor { /* 0x764 */ u32 mParticleKey; /* 0x768 */ u8 mDebrisCount; +public: u8 getSwBit1() { return fopAcM_GetParamBit(this, 0, 8); } u8 getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); } u8 getScale() { return fopAcM_GetParamBit(this, 0x10, 8); } diff --git a/include/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock.h b/include/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock.h index f4671583a33..c9871c893a3 100644 --- a/include/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock.h +++ b/include/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock.h @@ -6,6 +6,14 @@ #include "d/cc/d_cc_d.h" #include "d/bg/d_bg_s_acch.h" +/** + * @ingroup actors-objects + * @class daZrTuraRc_c + * @brief Zora Drop Rock + * + * @details + * + */ class daZrTuraRc_c : public fopAc_ac_c { public: /* 80D41934 */ void setBaseMtx(); @@ -22,6 +30,7 @@ class daZrTuraRc_c : public fopAc_ac_c { /* 80D42160 */ int Draw(); /* 80D421C4 */ int Delete(); +private: /* 0x568 */ dCcD_Stts mCcStatus; /* 0x5A4 */ dCcD_Sph mCcSph; /* 0x6DC */ request_of_phase_process_class mPhaseReq; @@ -33,6 +42,7 @@ class daZrTuraRc_c : public fopAc_ac_c { /* 0x740 */ dBgS_ObjAcch mAcch; /* 0x918 */ Z2SoundObjSimple mSound; +public: u8 getScale() { return fopAcM_GetParamBit(this, 0, 8); } static dCcD_SrcGObjInf const mCcDObjInfo; diff --git a/include/rel/d/a/obj/d_a_obj_zraMark/d_a_obj_zraMark.h b/include/rel/d/a/obj/d_a_obj_zraMark/d_a_obj_zraMark.h index 0ad5de021f3..0b5ca0ca3e6 100644 --- a/include/rel/d/a/obj/d_a_obj_zraMark/d_a_obj_zraMark.h +++ b/include/rel/d/a/obj/d_a_obj_zraMark/d_a_obj_zraMark.h @@ -3,6 +3,14 @@ #include "f_op/f_op_actor_mng.h" +/** + * @ingroup actors-objects + * @class daObjZraMark_c + * @brief Zora Mark + * + * @details + * + */ class daObjZraMark_c : public fopAc_ac_c { public: /* 80D42678 */ void Create(); @@ -19,6 +27,29 @@ class daObjZraMark_c : public fopAc_ac_c { /* 80D43370 */ void informBlast(); u8 getMarkNo() { return fopAcM_GetParam(this) & 0xff; } +private: + /* 0x568 */ u8 field_0x568[0x3e40 - 0x568]; }; +STATIC_ASSERT(sizeof(daObjZraMark_c) == 0x3e40); + +class _ZraMark_Hahen_c : public fopAc_ac_c { +public: + /* 80D4347C */ void create(cXyz const&, s8, s8, s8, s8); + /* 80D434F8 */ void loadModel(); + /* 80D4357C */ void init(cXyz const&, s8, s8, s8); + /* 80D43808 */ void calcSpeed(); + /* 80D43864 */ void setMtx(); + /* 80D438C8 */ void draw(); + /* 80D43B48 */ ~_ZraMark_Hahen_c(); + /* 80D43BB4 */ _ZraMark_Hahen_c(); +}; + +class _ZraMark_Hahen_Mng_c : public fopAc_ac_c { +public: + /* 80D43968 */ void create(cXyz const&, s8, s8, s8, s8); + /* 80D439F8 */ void calc(); + /* 80D43A74 */ void draw(); +}; + #endif /* D_A_OBJ_ZRAMARK_H */ diff --git a/include/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze.h b/include/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze.h index c8ddcede03e..42430e2c1e2 100644 --- a/include/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze.h +++ b/include/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze.h @@ -4,6 +4,14 @@ #include "SSystem/SComponent/c_phase.h" #include "f_op/f_op_actor.h" +/** + * @ingroup actors-objects + * @class daZraFreeze_c + * @brief Zora (Frozen) + * + * @details + * + */ class daZraFreeze_c : public fopAc_ac_c { public: /* 80D440B8 */ void setBaseMtx(); diff --git a/include/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.h b/include/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.h index a601f3ad07a..f6669e0981a 100644 --- a/include/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.h +++ b/include/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.h @@ -5,6 +5,14 @@ #include "d/bg/d_bg_s_acch.h" #include "d/bg/d_bg_s_movebg_actor.h" +/** + * @ingroup actors-objects + * @class daObjZraRock_c + * @brief Zora Rock + * + * @details + * + */ class daObjZraRock_c : public dBgS_MoveBgActor { public: /* 80D44CB8 */ void setAttnPos(); @@ -20,6 +28,7 @@ class daObjZraRock_c : public dBgS_MoveBgActor { void setDemoStart() { mDemoStart = 1; } +private: /* 0x5A0 */ request_of_phase_process_class mPhaseReq; /* 0x5A8 */ J3DModel* mpModelXlu; /* 0x5AC */ J3DModel* mpModelOpa; diff --git a/include/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.h b/include/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.h index bfebede5741..728a995a9fe 100644 --- a/include/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.h +++ b/include/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.h @@ -6,6 +6,14 @@ class daObjMirror6Pole_c; typedef void (daObjMirror6Pole_c::*actionFunc)(); +/** + * @ingroup actors-objects + * @class daObjMirror6Pole_c + * @brief Twilight Mirror Pole + * + * @details + * + */ class daObjMirror6Pole_c : public fopAc_ac_c { public: enum Mode_e { @@ -53,11 +61,13 @@ class daObjMirror6Pole_c : public fopAc_ac_c { static actionFunc ActionTable[][2]; +private: /* 0x568 */ J3DModel* mpModel; /* 0x56C */ mDoExt_bckAnm* mpBck; /* 0x570 */ request_of_phase_process_class mPhase; /* 0x578 */ actionFunc* mAction; /* 0x57C */ Mode_e mMode; }; +STATIC_ASSERT(sizeof(daObjMirror6Pole_c) == 0x580); #endif /* D_A_OBJ_MIRROR_6POLE_H */ diff --git a/include/rel/d/a/obj/mirror/d_a_obj_mirror_chain/d_a_obj_mirror_chain.h b/include/rel/d/a/obj/mirror/d_a_obj_mirror_chain/d_a_obj_mirror_chain.h index 0fa920bc6a3..9ee242dd1c2 100644 --- a/include/rel/d/a/obj/mirror/d_a_obj_mirror_chain/d_a_obj_mirror_chain.h +++ b/include/rel/d/a/obj/mirror/d_a_obj_mirror_chain/d_a_obj_mirror_chain.h @@ -5,6 +5,7 @@ #include "f_op/f_op_actor_mng.h" #include "d/bg/d_bg_w.h" + class dScissorBegin_packet_c : public J3DPacket { public: /* 80C96698 */ void draw(); @@ -24,6 +25,14 @@ class dScissorEnd_packet_c : public J3DPacket { void entryPacket() { j3dSys.getDrawBuffer(1)->entryImm(this, 0); } }; +/** + * @ingroup actors-objects + * @class daObjMirrorChain_c + * @brief Twilight Mirror Chain + * + * @details + * + */ class daObjMirrorChain_c : public fopAc_ac_c { public: /* 80C96E40 */ int createHeap(); @@ -38,6 +47,7 @@ class daObjMirrorChain_c : public fopAc_ac_c { u8 getSwitchNo() { return (fopAcM_GetParam(this) >> 8) & 0xff; } void setAnmSpeed(f32 speed) { mpBckAnm->setPlaySpeed(speed); } +private: /* 0x568 */ J3DModel* mpModel; /* 0x56C */ J3DModel* mpPortalModel; /* 0x570 */ mDoExt_bckAnm* mpBckAnm; diff --git a/include/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.h b/include/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.h index 51b11520b7c..c5728187339 100644 --- a/include/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.h +++ b/include/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.h @@ -4,6 +4,14 @@ #include "d/com/d_com_inf_game.h" #include "d/bg/d_bg_w.h" +/** + * @ingroup actors-objects + * @class daObjMirrorSand_c + * @brief Twilight Mirror Sand + * + * @details + * + */ class daObjMirrorSand_c : public fopAc_ac_c { public: /* 80C98508 */ void initBaseMtx(); @@ -27,6 +35,7 @@ class daObjMirrorSand_c : public fopAc_ac_c { dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354]); } +private: /* 0x568 */ J3DModel* mpModel; /* 0x56C */ mDoExt_bckAnm* mpBck; /* 0x570 */ request_of_phase_process_class mPhase; @@ -34,5 +43,6 @@ class daObjMirrorSand_c : public fopAc_ac_c { /* 0x57C */ dBgW mBgw[2]; /* 0x6FC */ Mtx mBgMtx; }; +STATIC_ASSERT(sizeof(daObjMirrorSand_c) == 0x72C); #endif /* D_A_OBJ_MIRROR_SAND_H */ diff --git a/include/rel/d/a/obj/mirror/d_a_obj_mirror_screw/d_a_obj_mirror_screw.h b/include/rel/d/a/obj/mirror/d_a_obj_mirror_screw/d_a_obj_mirror_screw.h index e76c97da277..3e3bfb49316 100644 --- a/include/rel/d/a/obj/mirror/d_a_obj_mirror_screw/d_a_obj_mirror_screw.h +++ b/include/rel/d/a/obj/mirror/d_a_obj_mirror_screw/d_a_obj_mirror_screw.h @@ -11,6 +11,14 @@ class daObjMirrorScrew_c; typedef void (daObjMirrorScrew_c::*daObjMirrorScrew_actionFunc)(); +/** + * @ingroup actors-objects + * @class daObjMirrorScrew_c + * @brief Twilight Mirror Screw + * + * @details + * + */ class daObjMirrorScrew_c : public dBgS_MoveBgActor { public: struct attr { @@ -57,6 +65,7 @@ class daObjMirrorScrew_c : public dBgS_MoveBgActor { (this->*mpActionFunc[1])(); } +private: /* 0x5A0 */ J3DModel* mpModel; /* 0x5A4 */ request_of_phase_process_class mPhaseReq; /* 0x5AC */ daObjMirrorScrew_actionFunc* mpActionFunc; diff --git a/include/rel/d/a/obj/mirror/d_a_obj_mirror_table/d_a_obj_mirror_table.h b/include/rel/d/a/obj/mirror/d_a_obj_mirror_table/d_a_obj_mirror_table.h index c4020422d66..a8c8e8fd6ea 100644 --- a/include/rel/d/a/obj/mirror/d_a_obj_mirror_table/d_a_obj_mirror_table.h +++ b/include/rel/d/a/obj/mirror/d_a_obj_mirror_table/d_a_obj_mirror_table.h @@ -4,6 +4,14 @@ #include "f_op/f_op_actor_mng.h" #include "d/bg/d_bg_w.h" +/** + * @ingroup actors-objects + * @class daObjMirrorTable_c + * @brief Twilight Mirror Table + * + * @details + * + */ class daObjMirrorTable_c : public fopAc_ac_c { public: /* 80C99938 */ int createHeap(); diff --git a/include/rel/d/a/tag/d_a_tag_yami/d_a_tag_yami.h b/include/rel/d/a/tag/d_a_tag_yami/d_a_tag_yami.h index 1ea30c0d8fe..7a4a924e6a2 100644 --- a/include/rel/d/a/tag/d_a_tag_yami/d_a_tag_yami.h +++ b/include/rel/d/a/tag/d_a_tag_yami/d_a_tag_yami.h @@ -2,7 +2,6 @@ #define D_A_TAG_YAMI_H #include "d/cc/d_cc_d.h" -#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" class daTagYami_c : public fopAc_ac_c { @@ -35,6 +34,7 @@ class daTagYami_c : public fopAc_ac_c { void setCoR(f32 i_value) { mCoR = i_value; } void setCoH(f32 i_value) { mCoH = i_value; } +private: /* 0x568 */ dCcD_Cyl mCyl; /* 0x6A4 */ dCcD_Stts mStts; /* 0x6E0 */ u8 mCoHitValid; diff --git a/rel/d/a/e/d_a_e_vt/d_a_e_vt.cpp b/rel/d/a/e/d_a_e_vt/d_a_e_vt.cpp index 076884e4d2c..837edc42790 100644 --- a/rel/d/a/e/d_a_e_vt/d_a_e_vt.cpp +++ b/rel/d/a/e/d_a_e_vt/d_a_e_vt.cpp @@ -12,6 +12,7 @@ #include "d/com/d_com_inf_game.h" #include "d/s/d_s_play.h" #include "dol2asm.h" +#include "d/d_camera.h" static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); diff --git a/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp b/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp index e86ab32782b..99c2a03da12 100644 --- a/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp +++ b/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp @@ -1,80 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_Lv5Key -// +/** + * @file d_a_obj_Lv5Key.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcSph {}; - -struct dCcD_Sph { - /* 80084A34 */ void Set(dCcD_SrcSph const&); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80B9C828 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); -}; - -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); - /* 800773C0 */ void SetGndThinCellingOff(); -}; - -struct cM3dGSph { - /* 8026F648 */ void SetC(cXyz const&); - /* 8026F708 */ void SetR(f32); - /* 80B9C798 */ ~cM3dGSph(); -}; - -struct cM3dGAab { - /* 80B9C7E0 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; // // Forward References: @@ -586,25 +517,30 @@ static asm void daObjLv5Key_Execute(daObjLv5Key_c* param_0) { /* ############################################################################################## */ /* 80B9CA00-80B9CA20 -00001 0020+00 1/0 0/0 0/0 .data l_daObjLv5Key_Method */ -SECTION_DATA static void* l_daObjLv5Key_Method[8] = { - (void*)daObjLv5Key_Create__FP10fopAc_ac_c, - (void*)daObjLv5Key_Delete__FP13daObjLv5Key_c, - (void*)daObjLv5Key_Execute__FP13daObjLv5Key_c, - (void*)daObjLv5Key_IsDelete__FP13daObjLv5Key_c, - (void*)daObjLv5Key_Draw__FP13daObjLv5Key_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjLv5Key_Method = { + (process_method_func)daObjLv5Key_Create__FP10fopAc_ac_c, + (process_method_func)daObjLv5Key_Delete__FP13daObjLv5Key_c, + (process_method_func)daObjLv5Key_Execute__FP13daObjLv5Key_c, + (process_method_func)daObjLv5Key_IsDelete__FP13daObjLv5Key_c, + (process_method_func)daObjLv5Key_Draw__FP13daObjLv5Key_c, }; /* 80B9CA20-80B9CA50 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv5Key */ -SECTION_DATA extern void* g_profile_Obj_Lv5Key[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01150000, (void*)&g_fpcLf_Method, - (void*)0x0000097C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x002E0000, (void*)&l_daObjLv5Key_Method, - (void*)0x00044180, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv5Key = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv5Key, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjLv5Key_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 46, // mPriority + &l_daObjLv5Key_Method, // sub_method + 0x00044180, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80B9CA50-80B9CA5C 00009C 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGSph */ @@ -655,7 +591,8 @@ asm void daObjLv5Key_c::create_1st() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { +// asm cM3dGSph::~cM3dGSph() { +extern "C" asm void __dt__8cM3dGSphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/__dt__8cM3dGSphFv.s" } @@ -665,7 +602,8 @@ asm cM3dGSph::~cM3dGSph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/__dt__8cM3dGAabFv.s" } @@ -675,7 +613,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara.cpp b/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara.cpp index 10cb7ff5361..f253aa3ec8c 100644 --- a/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara.cpp +++ b/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara.cpp @@ -1,245 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_Turara -// +/** + * @file d_a_obj_Turara.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80B9CC54 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct fOpAcm_HIO_entry_c { - /* 80B9CBF8 */ ~fOpAcm_HIO_entry_c(); -}; - -struct daTurara_c { - /* 80B9CC9C */ void setBaseMtx(); - /* 80B9CD74 */ void CreateHeap(); - /* 80B9CED8 */ void create(); - /* 80B9D468 */ void setFallStat(); - /* 80B9D4CC */ void Execute(f32 (**)[3][4]); - /* 80B9D548 */ void move(); - /* 80B9D72C */ void init_modeWait(); - /* 80B9D738 */ void modeWait(); - /* 80B9D998 */ void eventStart(); - /* 80B9D9BC */ void init_modeDropInit(); - /* 80B9DA00 */ void modeDropInit(); - /* 80B9DA44 */ void init_modeDrop(); - /* 80B9DB44 */ void modeDrop(); - /* 80B9DB90 */ void bgCheck(); - /* 80B9DBD0 */ void init_modeDropEnd(); - /* 80B9DE48 */ void modeDropEnd(); - /* 80B9E078 */ void init_modeDropEnd2(); - /* 80B9E338 */ void modeDropEnd2(); - /* 80B9E388 */ void Draw(); - /* 80B9E478 */ void Delete(); - /* 80B9E710 */ ~daTurara_c(); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; -}; - -struct daTurara_HIO_c { - /* 80B9CB8C */ daTurara_HIO_c(); - /* 80B9E5B4 */ ~daTurara_HIO_c(); -}; - -struct cXyz {}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dEvLib_callback_c { - /* 8004886C */ void eventUpdate(); - /* 80048940 */ void orderEvent(int, int, int); - /* 80B9E6B0 */ ~dEvLib_callback_c(); - /* 80B9E6F8 */ bool eventStart(); - /* 80B9E700 */ bool eventRun(); - /* 80B9E708 */ bool eventEnd(); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); - /* 80B9D40C */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 80084548 */ void GetTgHitGObj(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80B9D29C */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80B9D30C */ ~dBgS_AcchCir(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80B9D37C */ ~cM3dGCyl(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; -struct cM3dGAab { - /* 80B9D3C4 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80B9E56C */ ~cCcD_GStts(); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -365,15 +132,11 @@ extern "C" void cLib_addCalc0__FPfff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -382,8 +145,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -514,25 +275,30 @@ SECTION_DATA static u8 mode_proc[60] = { #pragma pop /* 80B9EA58-80B9EA78 -00001 0020+00 1/0 0/0 0/0 .data l_daTurara_Method */ -SECTION_DATA static void* l_daTurara_Method[8] = { - (void*)daTurara_Create__FP10fopAc_ac_c, - (void*)daTurara_Delete__FP10daTurara_c, - (void*)daTurara_Execute__FP10daTurara_c, - (void*)NULL, - (void*)daTurara_Draw__FP10daTurara_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daTurara_Method = { + (process_method_func)daTurara_Create__FP10fopAc_ac_c, + (process_method_func)daTurara_Delete__FP10daTurara_c, + (process_method_func)daTurara_Execute__FP10daTurara_c, + 0, + (process_method_func)daTurara_Draw__FP10daTurara_c, }; /* 80B9EA78-80B9EAA8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Turara */ -SECTION_DATA extern void* g_profile_Obj_Turara[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00500000, (void*)&g_fpcLf_Method, - (void*)0x00000998, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02210000, (void*)&l_daTurara_Method, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Turara = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Turara, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daTurara_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 545, // mPriority + &l_daTurara_Method, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80B9EAA8-80B9EAB4 00012C 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -650,7 +416,8 @@ asm daTurara_HIO_c::daTurara_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { +// asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { +extern "C" asm void __dt__18fOpAcm_HIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara/__dt__18fOpAcm_HIO_entry_cFv.s" } @@ -660,7 +427,8 @@ asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara/__dt__14mDoHIO_entry_cFv.s" } @@ -745,7 +513,8 @@ asm void daTurara_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara/__dt__12dBgS_ObjAcchFv.s" } @@ -755,7 +524,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara/__dt__12dBgS_AcchCirFv.s" } @@ -765,7 +535,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara/__dt__8cM3dGCylFv.s" } @@ -775,7 +546,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara/__dt__8cM3dGAabFv.s" } @@ -785,7 +557,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara/__dt__10dCcD_GSttsFv.s" } @@ -1076,7 +849,8 @@ static asm void daTurara_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara/__dt__10cCcD_GSttsFv.s" } @@ -1151,7 +925,8 @@ static asm void func_80B9E6A8() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dEvLib_callback_c::~dEvLib_callback_c() { +// asm dEvLib_callback_c::~dEvLib_callback_c() { +extern "C" asm void __dt__17dEvLib_callback_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara/__dt__17dEvLib_callback_cFv.s" } @@ -1159,17 +934,20 @@ asm dEvLib_callback_c::~dEvLib_callback_c() { /* 80B9E6F8-80B9E700 001C58 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventStart() { +// bool dEvLib_callback_c::eventStart() { +extern "C" bool eventStart__17dEvLib_callback_cFv() { return true; } /* 80B9E700-80B9E708 001C60 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventRun() { +// bool dEvLib_callback_c::eventRun() { +extern "C" bool eventRun__17dEvLib_callback_cFv() { return true; } /* 80B9E708-80B9E710 001C68 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventEnd() { +// bool dEvLib_callback_c::eventEnd() { +extern "C" bool eventEnd__17dEvLib_callback_cFv() { return true; } diff --git a/rel/d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst.cpp b/rel/d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst.cpp index a5f28eeb7d6..53ec131f455 100644 --- a/rel/d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst.cpp +++ b/rel/d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst.cpp @@ -1,143 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_TvCdlst -// +/** + * @file d_a_obj_TvCdlst.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80B9ECF8 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daTvCdlst_c { - /* 80B9ED40 */ void setBaseMtx(); - /* 80B9EDC8 */ void CreateHeap(); - /* 80B9EE34 */ void create(); - /* 80B9F144 */ void createHeapCallBack(fopAc_ac_c*); - /* 80B9F164 */ void lightInit(); - /* 80B9F1F0 */ void setLight(); - /* 80B9F220 */ void cutLight(); - /* 80B9F250 */ void pointLightProc(); - /* 80B9F300 */ void Execute(); - /* 80B9F634 */ void Draw(); - /* 80B9F6D8 */ void Delete(); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; -}; - -struct daTvCdlst_HIO_c { - /* 80B9ECCC */ daTvCdlst_HIO_c(); - /* 80B9F7B0 */ ~daTvCdlst_HIO_c(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004D1B8 */ void setSimple(u16, cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&, - _GXColor const&, int, f32); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 800844F8 */ void GetTgHitObj(); - /* 8008457C */ void GetTgHitObjSe(); - /* 800845B0 */ void getHitSeID(u8, int); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80B9F0B4 */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80B9F0FC */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDFF8 */ void deleteObject(); - /* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct LIGHT_INFLUENCE {}; - -struct J3DModel {}; // // Forward References: @@ -208,12 +77,8 @@ extern "C" void deleteObject__14Z2SoundObjBaseFv(); extern "C" void startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase(); extern "C" void __ct__16Z2SoundObjSimpleFv(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -221,8 +86,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" extern u32 g_whiteColor; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -242,25 +105,30 @@ SECTION_DATA u8 daTvCdlst_c::mCcDCyl[68] = { }; /* 80B9F944-80B9F964 -00001 0020+00 1/0 0/0 0/0 .data l_daTvCdlst_Method */ -SECTION_DATA static void* l_daTvCdlst_Method[8] = { - (void*)daTvCdlst_Create__FP10fopAc_ac_c, - (void*)daTvCdlst_Delete__FP11daTvCdlst_c, - (void*)daTvCdlst_Execute__FP11daTvCdlst_c, - (void*)NULL, - (void*)daTvCdlst_Draw__FP11daTvCdlst_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daTvCdlst_Method = { + (process_method_func)daTvCdlst_Create__FP10fopAc_ac_c, + (process_method_func)daTvCdlst_Delete__FP11daTvCdlst_c, + (process_method_func)daTvCdlst_Execute__FP11daTvCdlst_c, + 0, + (process_method_func)daTvCdlst_Draw__FP11daTvCdlst_c, }; /* 80B9F964-80B9F994 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_TvCdlst */ -SECTION_DATA extern void* g_profile_Obj_TvCdlst[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x003B0000, (void*)&g_fpcLf_Method, - (void*)0x00000754, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01F00000, (void*)&l_daTvCdlst_Method, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_TvCdlst = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_TvCdlst, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daTvCdlst_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 496, // mPriority + &l_daTvCdlst_Method, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80B9F994-80B9F9A0 000094 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ @@ -305,7 +173,8 @@ asm daTvCdlst_HIO_c::daTvCdlst_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst/__dt__14mDoHIO_entry_cFv.s" } @@ -365,7 +234,8 @@ asm void daTvCdlst_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst/__dt__8cM3dGCylFv.s" } @@ -375,7 +245,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst/__dt__8cM3dGAabFv.s" } diff --git a/rel/d/a/obj/d_a_obj_Y_taihou/d_a_obj_Y_taihou.cpp b/rel/d/a/obj/d_a_obj_Y_taihou/d_a_obj_Y_taihou.cpp index 65dddda8d2b..fa6171d98b8 100644 --- a/rel/d/a/obj/d_a_obj_Y_taihou/d_a_obj_Y_taihou.cpp +++ b/rel/d/a/obj/d_a_obj_Y_taihou/d_a_obj_Y_taihou.cpp @@ -1,128 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_Y_taihou -// +/** + * @file d_a_obj_Y_taihou.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_Y_taihou/d_a_obj_Y_taihou.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjCarry_c {}; - -struct daObjYtaihou_c { - /* 80B9FDE8 */ void create1st(); - /* 80B9FEB0 */ void setIronBall(daObjCarry_c*); - /* 80B9FF08 */ void getEvent(u8); - /* 80B9FF1C */ void loadAngle(); - /* 80B9FFAC */ void saveAngle(); - /* 80BA0060 */ void setNextAngle(); - /* 80BA0084 */ void setMtx(); - /* 80BA0208 */ void rotateCheck(); - /* 80BA045C */ void shotCheck(); - /* 80BA0964 */ void eventStart(); - /* 80BA0974 */ void CreateHeap(); - /* 80BA09E4 */ void Create(); - /* 80BA0A94 */ void Execute(f32 (**)[3][4]); - /* 80BA0B4C */ void Draw(); - /* 80BA0C1C */ void Delete(); - /* 80BA0FA4 */ ~daObjYtaihou_c(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 800352B0 */ void offSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dEvLib_callback_c { - /* 8004886C */ void eventUpdate(); - /* 80048940 */ void orderEvent(int, int, int); - /* 80BA0F44 */ ~dEvLib_callback_c(); - /* 80BA0F8C */ bool eventStart(); - /* 80BA0F94 */ bool eventRun(); - /* 80BA0F9C */ bool eventEnd(); -}; - -struct dBgW_Base { - struct PushPullLabel {}; -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; +#include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h" // // Forward References: @@ -220,15 +104,10 @@ extern "C" void cLib_distanceAngleS__Fss(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -236,9 +115,6 @@ extern "C" extern void* __vt__12cCcD_CylAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -756,25 +632,30 @@ asm void daObjYtaihou_c::Delete() { /* ############################################################################################## */ /* 80BA1230-80BA1250 -00001 0020+00 1/0 0/0 0/0 .data daObjYtaihou_METHODS */ -SECTION_DATA static void* daObjYtaihou_METHODS[8] = { - (void*)daObjYtaihou_create1st__FP14daObjYtaihou_c, - (void*)daObjYtaihou_MoveBGDelete__FP14daObjYtaihou_c, - (void*)daObjYtaihou_MoveBGExecute__FP14daObjYtaihou_c, - (void*)NULL, - (void*)daObjYtaihou_MoveBGDraw__FP14daObjYtaihou_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjYtaihou_METHODS = { + (process_method_func)daObjYtaihou_create1st__FP14daObjYtaihou_c, + (process_method_func)daObjYtaihou_MoveBGDelete__FP14daObjYtaihou_c, + (process_method_func)daObjYtaihou_MoveBGExecute__FP14daObjYtaihou_c, + 0, + (process_method_func)daObjYtaihou_MoveBGDraw__FP14daObjYtaihou_c, }; /* 80BA1250-80BA1280 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Ytaihou */ -SECTION_DATA extern void* g_profile_Obj_Ytaihou[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00910000, (void*)&g_fpcLf_Method, - (void*)0x00000778, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x027B0000, (void*)&daObjYtaihou_METHODS, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Ytaihou = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Ytaihou, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjYtaihou_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 635, // mPriority + &daObjYtaihou_METHODS, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BA1280-80BA128C 0000A0 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -929,7 +810,8 @@ extern "C" asm void __dt__10cCcD_GSttsFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dEvLib_callback_c::~dEvLib_callback_c() { +// asm dEvLib_callback_c::~dEvLib_callback_c() { +extern "C" asm void __dt__17dEvLib_callback_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_Y_taihou/d_a_obj_Y_taihou/__dt__17dEvLib_callback_cFv.s" } @@ -937,17 +819,20 @@ asm dEvLib_callback_c::~dEvLib_callback_c() { /* 80BA0F8C-80BA0F94 00158C 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventStart() { +// bool dEvLib_callback_c::eventStart() { +extern "C" bool eventStart__17dEvLib_callback_cFv() { return true; } /* 80BA0F94-80BA0F9C 001594 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventRun() { +// bool dEvLib_callback_c::eventRun() { +extern "C" bool eventRun__17dEvLib_callback_cFv() { return true; } /* 80BA0F9C-80BA0FA4 00159C 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventEnd() { +// bool dEvLib_callback_c::eventEnd() { +extern "C" bool eventEnd__17dEvLib_callback_cFv() { return true; } diff --git a/rel/d/a/obj/d_a_obj_amiShutter/d_a_obj_amiShutter.cpp b/rel/d/a/obj/d_a_obj_amiShutter/d_a_obj_amiShutter.cpp index 6fa2ed88b06..77977018492 100644 --- a/rel/d/a/obj/d_a_obj_amiShutter/d_a_obj_amiShutter.cpp +++ b/rel/d/a/obj/d_a_obj_amiShutter/d_a_obj_amiShutter.cpp @@ -1,124 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_amiShutter -// +/** + * @file d_a_obj_amiShutter.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_amiShutter/d_a_obj_amiShutter.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80BA1514 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daAmiShutter_c { - /* 80BA155C */ void setBaseMtx(); - /* 80BA15E4 */ void CreateHeap(); - /* 80BA1650 */ void create(); - /* 80BA182C */ void Execute(f32 (**)[3][4]); - /* 80BA1888 */ void moveShutter(); - /* 80BA1974 */ void playerAreaCheck(); - /* 80BA1B4C */ void init_modeWait(); - /* 80BA1B58 */ void modeWait(); - /* 80BA1BCC */ void init_modeWaitEvent(); - /* 80BA1BD8 */ void modeWaitEvent(); - /* 80BA1C90 */ void eventStart(); - /* 80BA1CB4 */ void init_modeClose(); - /* 80BA1D48 */ void modeClose(); - /* 80BA1DCC */ void init_modeCloseEvent(); - /* 80BA1E60 */ void modeCloseEvent(); - /* 80BA1EEC */ void init_modeCloseEnd(); - /* 80BA1F7C */ void modeCloseEnd(); - /* 80BA1F80 */ void init_modeOpen(); - /* 80BA2004 */ void modeOpen(); - /* 80BA2080 */ void Draw(); - /* 80BA2124 */ void Delete(); - /* 80BA22E8 */ ~daAmiShutter_c(); -}; - -struct daAmiShutter_HIO_c { - /* 80BA14CC */ daAmiShutter_HIO_c(); - /* 80BA21E0 */ ~daAmiShutter_HIO_c(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dEvLib_callback_c { - /* 8004886C */ void eventUpdate(); - /* 80048940 */ void orderEvent(int, int, int); - /* 80BA2288 */ ~dEvLib_callback_c(); - /* 80BA22D0 */ bool eventStart(); - /* 80BA22D8 */ bool eventRun(); - /* 80BA22E0 */ bool eventEnd(); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -194,20 +82,12 @@ extern "C" void __mi__4cXyzCFRC3Vec(); extern "C" void cLib_addCalc__FPfffff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSVECSquareMag(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_28(); extern "C" void _restgpr_28(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; extern "C" extern u8 struct_80450C98[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -316,25 +196,30 @@ SECTION_DATA static u8 mode_proc[72] = { #pragma pop /* 80BA248C-80BA24AC -00001 0020+00 1/0 0/0 0/0 .data l_daAmiShutter_Method */ -SECTION_DATA static void* l_daAmiShutter_Method[8] = { - (void*)daAmiShutter_Create__FP10fopAc_ac_c, - (void*)daAmiShutter_Delete__FP14daAmiShutter_c, - (void*)daAmiShutter_Execute__FP14daAmiShutter_c, - (void*)NULL, - (void*)daAmiShutter_Draw__FP14daAmiShutter_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daAmiShutter_Method = { + (process_method_func)daAmiShutter_Create__FP10fopAc_ac_c, + (process_method_func)daAmiShutter_Delete__FP14daAmiShutter_c, + (process_method_func)daAmiShutter_Execute__FP14daAmiShutter_c, + 0, + (process_method_func)daAmiShutter_Draw__FP14daAmiShutter_c, }; /* 80BA24AC-80BA24DC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_AmiShutter */ -SECTION_DATA extern void* g_profile_Obj_AmiShutter[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00470000, (void*)&g_fpcLf_Method, - (void*)0x000005DC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02090000, (void*)&l_daAmiShutter_Method, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_AmiShutter = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_AmiShutter, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daAmiShutter_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 521, // mPriority + &l_daAmiShutter_Method, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BA24DC-80BA24F4 000100 0018+00 3/3 0/0 0/0 .data __vt__17dEvLib_callback_c */ @@ -397,7 +282,8 @@ asm daAmiShutter_HIO_c::daAmiShutter_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_amiShutter/d_a_obj_amiShutter/__dt__14mDoHIO_entry_cFv.s" } @@ -808,7 +694,8 @@ static asm void func_80BA2280() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dEvLib_callback_c::~dEvLib_callback_c() { +// asm dEvLib_callback_c::~dEvLib_callback_c() { +extern "C" asm void __dt__17dEvLib_callback_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_amiShutter/d_a_obj_amiShutter/__dt__17dEvLib_callback_cFv.s" } @@ -816,17 +703,20 @@ asm dEvLib_callback_c::~dEvLib_callback_c() { /* 80BA22D0-80BA22D8 000EF0 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventStart() { +// bool dEvLib_callback_c::eventStart()() { +extern "C" bool eventStart__17dEvLib_callback_cFv() { return true; } /* 80BA22D8-80BA22E0 000EF8 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventRun() { +// bool dEvLib_callback_c::eventRun() { +extern "C" bool eventRun__17dEvLib_callback_cFv() { return true; } /* 80BA22E0-80BA22E8 000F00 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventEnd() { +// bool dEvLib_callback_c::eventEnd() { +extern "C" bool eventEnd__17dEvLib_callback_cFv() { return true; } diff --git a/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.cpp b/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.cpp index deb440317b9..0f8fcf11649 100644 --- a/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.cpp +++ b/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.cpp @@ -1,162 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_automata -// +/** + * @file d_a_obj_automata.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct J3DAnmTextureSRTKey {}; - -struct J3DMaterialTable { - /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); -}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0420 */ ~Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; - -struct mDoExt_McaMorfSO { - /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, - int, Z2Creature*, u32, u32); - /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32); - /* 800110B0 */ void play(u32, s8); - /* 800111C0 */ void entryDL(); - /* 800111EC */ void modelCalc(); - /* 80011310 */ void stopZelAnime(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObj_AutoMata_c { - /* 80BA56EC */ ~daObj_AutoMata_c(); - /* 80BA5990 */ void create(); - /* 80BA5F88 */ void CreateHeap(); - /* 80BA60A0 */ void Delete(); - /* 80BA60D4 */ void Execute(); - /* 80BA639C */ void Draw(); - /* 80BA6480 */ void createHeapCallBack(fopAc_ac_c*); - /* 80BA64A0 */ void srchTHouse(fopAc_ac_c*, void*); - /* 80BA6500 */ void setAnm(int, bool); - /* 80BA6634 */ void setEnvTevColor(); - /* 80BA6690 */ void setRoomNo(); - /* 80BA66D4 */ void setMtx(); - /* 80BA674C */ void setSe(); -}; - -struct daObj_AutoMata_Param_c { - /* 80BA6BA4 */ ~daObj_AutoMata_Param_c(); - - static u8 const m[12]; -}; -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80BA5ED0 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80BA5E04 */ ~dBgS_AcchCir(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct dBgS { - /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_GndChk { - /* 80267C1C */ cBgS_GndChk(); - /* 80267C94 */ ~cBgS_GndChk(); -}; - -struct _GXTexObj {}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 8032842C */ void checkPass(f32); - /* 80BA5F40 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -259,9 +110,6 @@ extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); extern "C" void checkPass__12J3DFrameCtrlFf(); extern "C" void removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void __cvt_fp2unsigned(); extern "C" void _savegpr_25(); extern "C" void _savegpr_27(); @@ -271,8 +119,6 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -283,7 +129,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -358,25 +203,30 @@ static dCcD_SrcSph l_ccDSph = { }; /* 80BA6D64-80BA6D84 -00001 0020+00 1/0 0/0 0/0 .data daObj_AutoMata_MethodTable */ -SECTION_DATA static void* daObj_AutoMata_MethodTable[8] = { - (void*)daObj_AutoMata_Create__FPv, - (void*)daObj_AutoMata_Delete__FPv, - (void*)daObj_AutoMata_Execute__FPv, - (void*)daObj_AutoMata_IsDelete__FPv, - (void*)daObj_AutoMata_Draw__FPv, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObj_AutoMata_MethodTable = { + (process_method_func)daObj_AutoMata_Create__FPv, + (process_method_func)daObj_AutoMata_Delete__FPv, + (process_method_func)daObj_AutoMata_Execute__FPv, + (process_method_func)daObj_AutoMata_IsDelete__FPv, + (process_method_func)daObj_AutoMata_Draw__FPv, }; /* 80BA6D84-80BA6DB4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_AUTOMATA */ -SECTION_DATA extern void* g_profile_OBJ_AUTOMATA[12] = { - (void*)0xFFFFFFFD, (void*)0x0008FFFD, - (void*)0x02F90000, (void*)&g_fpcLf_Method, - (void*)0x00000B38, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00510000, (void*)&daObj_AutoMata_MethodTable, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_AUTOMATA = { + fpcLy_CURRENT_e, // mLayerID + 8, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_AUTOMATA, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObj_AutoMata_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 81, // mPriority + &daObj_AutoMata_MethodTable, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BA6DB4-80BA6DC0 000104 000C+00 3/3 0/0 0/0 .data __vt__12J3DFrameCtrl */ @@ -555,7 +405,8 @@ extern "C" asm void __dt__8cM3dGAabFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata/__dt__12dBgS_AcchCirFv.s" } @@ -576,7 +427,8 @@ extern "C" asm void __dt__10dCcD_GSttsFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata/__dt__12dBgS_ObjAcchFv.s" } @@ -586,7 +438,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.cpp b/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.cpp index 92f5c771c02..eb1e19e2efe 100644 --- a/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.cpp +++ b/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_avalanche -// +/** + * @file d_a_obj_avalanche.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.h" #include "d/bg/d_bg_w.h" diff --git a/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.cpp b/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.cpp index 7d6d003e6f8..b43b4dd35cc 100644 --- a/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.cpp +++ b/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.cpp @@ -1,237 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_batta -// +/** + * @file d_a_obj_batta.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct Vec {}; - -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; - -struct mDoExt_McaMorfSO { - /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, - int, Z2Creature*, u32, u32); - /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32); - /* 800110B0 */ void play(u32, s8); - /* 800111C0 */ void entryDL(); - /* 800111EC */ void modelCalc(); - /* 80011310 */ void stopZelAnime(); -}; - -struct fopAc_ac_c {}; - -struct daPy_boomerangMove_c { - /* 8015E5B0 */ void initOffset(cXyz const*); - /* 8015E654 */ void posMove(cXyz*, s16*, fopAc_ac_c*, s16); - /* 8015E87C */ void bgCheckAfterOffset(cXyz const*); -}; - -struct daObj_BattaHIO_c { - /* 80BA9E2C */ daObj_BattaHIO_c(); - /* 80BAC874 */ ~daObj_BattaHIO_c(); -}; - -struct daObjBATTA_c { - /* 80BA9E5C */ void setAction(void (daObjBATTA_c::*)()); - /* 80BAA1C8 */ void wait(); - /* 80BAA47C */ void turn(); - /* 80BAAA18 */ void jump(); - /* 80BAAD30 */ void fly_up(); - /* 80BAB234 */ void fly_down(); - /* 80BAB500 */ void bin_wait(); - /* 80BAB6C8 */ void bin_action(); - /* 80BAB820 */ void hook(); - /* 80BAB934 */ void boomerang(); - /* 80BABA98 */ void batta_setParticle(); - /* 80BABCA4 */ void action(); - /* 80BABD6C */ void hit_check(); - /* 80BABE20 */ void execute(); - /* 80BABFA4 */ void _delete(); - /* 80BAC00C */ void mtx_set(); - /* 80BAC194 */ void create(); -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dMenu_Insect_c { - /* 801D9F3C */ void isCatchNotGiveInsect(u8); -}; - -struct dInsect_c { - /* 8015E010 */ dInsect_c(); - /* 8015E078 */ void Insect_GetDemoMain(); - /* 8015E26C */ void CalcZBuffer(f32); - /* 80BAC908 */ void Insect_Release(); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcSph {}; - -struct dCcD_Sph { - /* 80084A34 */ void Set(dCcD_SrcSph const&); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); - /* 80BAC730 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 800844F8 */ void GetTgHitObj(); - /* 80084548 */ void GetTgHitGObj(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80BAC78C */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80BAC7FC */ ~dBgS_AcchCir(); -}; - -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGSph { - /* 8026F648 */ void SetC(cXyz const&); - /* 8026F708 */ void SetR(f32); - /* 80BAC6A0 */ ~cM3dGSph(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 80BAC6E8 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80BAC914 */ ~cCcD_GStts(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct _GXTexObj {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80BAA13C */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -348,8 +123,6 @@ extern "C" void init__10Z2CreatureFP3VecP3VecUcUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSVECSquareDistance(); extern "C" void __ptmf_test(); extern "C" void __ptmf_cmpr(); extern "C" void __ptmf_scall(); @@ -362,10 +135,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void abs(); -extern "C" void strcmp(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -375,8 +144,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u32 __float_nan; extern "C" void __register_global_object(); // @@ -547,25 +314,30 @@ SECTION_DATA static void* lit_4883[3] = { #pragma pop /* 80BACB9C-80BACBBC -00001 0020+00 1/0 0/0 0/0 .data l_daObjBATTA_Method */ -SECTION_DATA static void* l_daObjBATTA_Method[8] = { - (void*)daObjBATTA_Create__FP10fopAc_ac_c, - (void*)daObjBATTA_Delete__FP12daObjBATTA_c, - (void*)daObjBATTA_Execute__FP12daObjBATTA_c, - (void*)daObjBATTA_IsDelete__FP12daObjBATTA_c, - (void*)daObjBATTA_Draw__FP12daObjBATTA_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjBATTA_Method = { + (process_method_func)daObjBATTA_Create__FP10fopAc_ac_c, + (process_method_func)daObjBATTA_Delete__FP12daObjBATTA_c, + (process_method_func)daObjBATTA_Execute__FP12daObjBATTA_c, + (process_method_func)daObjBATTA_IsDelete__FP12daObjBATTA_c, + (process_method_func)daObjBATTA_Draw__FP12daObjBATTA_c, }; /* 80BACBBC-80BACBEC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Batta */ -SECTION_DATA extern void* g_profile_Obj_Batta[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01490000, (void*)&g_fpcLf_Method, - (void*)0x000009F8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01E60000, (void*)&l_daObjBATTA_Method, - (void*)0x000C0120, (void*)0x030E0000, +extern actor_process_profile_definition g_profile_Obj_Batta = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Batta, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjBATTA_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 486, // mPriority + &l_daObjBATTA_Method, // sub_method + 0x000C0120, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BACBEC-80BACBF8 00017C 000C+00 0/0 0/0 0/0 .data __vt__9dInsect_c */ @@ -704,7 +476,8 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta/__dt__12J3DFrameCtrlFv.s" } @@ -1285,7 +1058,8 @@ asm void daObjBATTA_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { +// asm cM3dGSph::~cM3dGSph() { +extern "C" asm void __dt__8cM3dGSphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta/__dt__8cM3dGSphFv.s" } @@ -1295,7 +1069,8 @@ asm cM3dGSph::~cM3dGSph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta/__dt__8cM3dGAabFv.s" } @@ -1305,7 +1080,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta/__dt__10dCcD_GSttsFv.s" } @@ -1315,7 +1091,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta/__dt__12dBgS_ObjAcchFv.s" } @@ -1325,7 +1102,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta/__dt__12dBgS_AcchCirFv.s" } @@ -1385,7 +1163,8 @@ static asm void func_80BAC900() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dInsect_c::Insect_Release() { +// asm void dInsect_c::Insect_Release() { +extern "C" asm void Insect_Release__9dInsect_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta/Insect_Release__9dInsect_cFv.s" } @@ -1395,7 +1174,8 @@ asm void dInsect_c::Insect_Release() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp b/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp index ea07306d431..6bda01a6e16 100644 --- a/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp +++ b/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_bed -// +/** + * @file d_a_obj_bed.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.h" #include "d/bg/d_bg_w.h" diff --git a/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.cpp b/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.cpp index 8ccc2931f71..e95aeb7f753 100644 --- a/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.cpp +++ b/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.cpp @@ -1,278 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_bemos -// +/** + * @file d_a_obj_bemos.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CDD4 */ void transM(cXyz const&); - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE38 */ void scaleM(f32, f32, f32); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c {}; - -struct fopAcM_lc_c { - /* 8001DC68 */ void lineCheck(cXyz const*, cXyz const*, fopAc_ac_c const*); - - static u8 mLineCheck[112]; -}; - -struct dBgW_Base { - struct PushPullLabel {}; -}; - -struct daObjBm_c { - struct BgcSrc_c {}; - - struct Bgc_c { - /* 80BB0E0C */ Bgc_c(); - /* 80BB0ED4 */ void wall_pos(fopAc_ac_c const*, daObjBm_c::BgcSrc_c const*, int, s16, f32); - /* 80BB1154 */ void chk_wall_pre(fopAc_ac_c const*, daObjBm_c::BgcSrc_c const*, int, s16); - - static u8 const M_lin20[368]; - static u8 M_lin5[80]; - static u8 M_gnd_work[1932]; - static u8 M_wrt_work[84]; - static u8 M_wall_work[2576]; - }; - - /* 80BAE36C */ void PPCallBack(fopAc_ac_c*, fopAc_ac_c*, s16, dBgW_Base::PushPullLabel); - /* 80BAE5FC */ void initBaseMtx(); - /* 80BAE68C */ void setBaseMtx(); - /* 80BAE778 */ void Create(); - /* 80BAEADC */ void CreateHeap(); - /* 80BAEFD8 */ void create1st(); - /* 80BAF09C */ void Execute(f32 (**)[3][4]); - /* 80BAF29C */ void main_proc_call(); - /* 80BAF328 */ void initActionEnBemos(); - /* 80BAF37C */ void initActionObjBemos(); - /* 80BAF46C */ void actionEnBemos(); - /* 80BAF750 */ void actionObjBemos(); - /* 80BAF80C */ void setCrawCO(); - /* 80BAF8F8 */ void calcBeamPos(); - /* 80BAFC08 */ void calcBeamLenAndAt(); - /* 80BAFFA8 */ void checkFindPlayer(); - /* 80BB0104 */ void checkSearchPlayer(); - /* 80BB0260 */ void getSearchDistance(); - /* 80BB02B8 */ void getBeamSearchDistance(); - /* 80BB0310 */ void effect_proc(); - /* 80BB0580 */ void effectWait(); - /* 80BB0584 */ void initEffectSet0(); - /* 80BB0718 */ void effectSet0(); - /* 80BB071C */ void effectSet1(); - /* 80BB0720 */ void effectEnd(); - /* 80BB0724 */ void check_to_walk(); - /* 80BB0824 */ void mode_wait_init(); - /* 80BB0888 */ void mode_wait(); - /* 80BB09C8 */ void mode_walk_init(); - /* 80BB09E0 */ void mode_walk(); - /* 80BB0DA8 */ void mode_afl(); - /* 80BB0DC0 */ void mode_dead_init(); - /* 80BB0DE4 */ void mode_dead(); - /* 80BB0DE8 */ void clr_moment_cnt(); - /* 80BB1194 */ void initActionSwWait(); - /* 80BB11D4 */ void actionSwWait(); - /* 80BB14C8 */ void initActionWarning(); - /* 80BB154C */ void actionWarning(); - /* 80BB1654 */ void initActionFindPlayer(); - /* 80BB1814 */ void actionFindPlayer(); - /* 80BB1960 */ void initActionAttack(); - /* 80BB1BD0 */ void actionAttack(); - /* 80BB248C */ void initActionDead(); - /* 80BB2700 */ void actionDead(); - /* 80BB2AB0 */ void Draw(); - /* 80BB2C8C */ void Delete(); - - static u8 const M_dir_base[8]; -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dCamera_c { - /* 80181534 */ void ForceLockOn(fopAc_ac_c*); -}; - -struct dBgW {}; - -struct dBgS_WtrChk { - /* 80079164 */ dBgS_WtrChk(); - /* 80BB35E0 */ ~dBgS_WtrChk(); -}; - -struct dBgS_SplGrpChk { - /* 80078C78 */ ~dBgS_SplGrpChk(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjLinChk { - /* 80077F5C */ dBgS_ObjLinChk(); - /* 80077FB8 */ ~dBgS_ObjLinChk(); -}; - -struct dBgS_ObjGndChk { - /* 80BB3690 */ ~dBgS_ObjGndChk(); - /* 80BB3708 */ dBgS_ObjGndChk(); -}; - -struct dBgS_ObjAcch { - /* 80BB336C */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_LinChk { - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80BB32FC */ ~dBgS_AcchCir(); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS_LinChk {}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDFF8 */ void deleteObject(); -}; - -struct JUTNameTab { - /* 802DEAF8 */ void getName(u16) const; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; - -struct J3DJoint {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80BAEF90 */ ~J3DFrameCtrl(); -}; +#include "d/d_camera.h" // // Forward References: @@ -475,9 +209,6 @@ extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void getName__10JUTNameTabCFUs(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void __ptmf_scall(); @@ -497,8 +228,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__8dCcD_Cps[36]; @@ -511,10 +240,8 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" u8 mLineCheck__11fopAcM_lc_c[112]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" f32 Zero__4cXyz[3]; extern "C" u8 BaseY__4cXyz[12]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -769,7 +496,7 @@ static dCcD_SrcCyl l_cyl_src = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjBm_c::Create() { +asm int daObjBm_c::Create() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos/Create__9daObjBm_cFv.s" } @@ -997,25 +724,30 @@ SECTION_DATA static void* lit_6065[8] = { }; /* 80BB3D84-80BB3DA4 -00001 0020+00 1/0 0/0 0/0 .data daObjBm_METHODS */ -SECTION_DATA static void* daObjBm_METHODS[8] = { - (void*)daObjBm_create1st__FP9daObjBm_c, - (void*)daObjBm_MoveBGDelete__FP9daObjBm_c, - (void*)daObjBm_MoveBGExecute__FP9daObjBm_c, - (void*)NULL, - (void*)daObjBm_MoveBGDraw__FP9daObjBm_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjBm_METHODS = { + (process_method_func)daObjBm_create1st__FP9daObjBm_c, + (process_method_func)daObjBm_MoveBGDelete__FP9daObjBm_c, + (process_method_func)daObjBm_MoveBGExecute__FP9daObjBm_c, + 0, + (process_method_func)daObjBm_MoveBGDraw__FP9daObjBm_c, }; /* 80BB3DA4-80BB3DD4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Bemos */ -SECTION_DATA extern void* g_profile_Obj_Bemos[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00840000, (void*)&g_fpcLf_Method, - (void*)0x00001258, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x025C0000, (void*)&daObjBm_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Bemos = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Bemos, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjBm_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 604, // mPriority + &daObjBm_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BB3DD4-80BB3DE0 000360 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ @@ -1091,7 +823,7 @@ SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjBm_c::CreateHeap() { +asm int daObjBm_c::CreateHeap() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos/CreateHeap__9daObjBm_cFv.s" } @@ -1101,7 +833,8 @@ asm void daObjBm_c::CreateHeap() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos/__dt__12J3DFrameCtrlFv.s" } @@ -1140,7 +873,7 @@ COMPILER_STRIP_GATE(0x80BB383C, &lit_4293); #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjBm_c::Execute(f32 (**param_0)[3][4]) { +asm int daObjBm_c::Execute(f32 (**param_0)[3][4]) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos/Execute__9daObjBm_cFPPA3_A4_f.s" } @@ -1989,7 +1722,7 @@ asm void daObjBm_c::actionDead() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjBm_c::Draw() { +asm int daObjBm_c::Draw() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos/Draw__9daObjBm_cFv.s" } @@ -1999,7 +1732,7 @@ asm void daObjBm_c::Draw() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjBm_c::Delete() { +asm int daObjBm_c::Delete() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos/Delete__9daObjBm_cFv.s" } @@ -2100,7 +1833,8 @@ extern "C" asm void __dt__10dCcD_GSttsFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos/__dt__12dBgS_AcchCirFv.s" } @@ -2110,7 +1844,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos/__dt__12dBgS_ObjAcchFv.s" } @@ -2241,7 +1976,8 @@ SECTION_DATA extern void* __vt__11dBgS_WtrChk[12] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_WtrChk::~dBgS_WtrChk() { +// asm dBgS_WtrChk::~dBgS_WtrChk() { +extern "C" asm void __dt__11dBgS_WtrChkFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos/__dt__11dBgS_WtrChkFv.s" } @@ -2261,7 +1997,8 @@ asm void func_80BB3658() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +// asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +extern "C" asm void __dt__14dBgS_ObjGndChkFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos/__dt__14dBgS_ObjGndChkFv.s" } @@ -2271,7 +2008,8 @@ asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjGndChk::dBgS_ObjGndChk() { +// asm dBgS_ObjGndChk::dBgS_ObjGndChk() { +extern "C" asm void __ct__14dBgS_ObjGndChkFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos/__ct__14dBgS_ObjGndChkFv.s" } diff --git a/rel/d/a/obj/d_a_obj_bhashi/d_a_obj_bhashi.cpp b/rel/d/a/obj/d_a_obj_bhashi/d_a_obj_bhashi.cpp index d74437447a2..c768ac04ce1 100644 --- a/rel/d/a/obj/d_a_obj_bhashi/d_a_obj_bhashi.cpp +++ b/rel/d/a/obj/d_a_obj_bhashi/d_a_obj_bhashi.cpp @@ -1,152 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_bhashi -// +/** + * @file d_a_obj_bhashi.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_bhashi/d_a_obj_bhashi.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static f32 mGroundY; -}; - -struct daObjBHASHI_c { - /* 80576A58 */ void initCcCylinder(); - /* 80576AC4 */ void setCcCylinder(); - /* 80576B78 */ void Set_Hahen(); - /* 80576C50 */ void Set_Speed(s16, s16, f32, f32); - /* 80577500 */ void Obj_Damage(cXyz); - /* 805771EC */ void Obj_Damage(); - /* 80577E24 */ void Rolling(cXyz*, f32, f32); - /* 805781FC */ void setBaseMtx(); - /* 80578330 */ void CreateHeap(); - /* 8057842C */ void create(); - /* 80578788 */ void Create(); - /* 805787CC */ void Execute(f32 (**)[3][4]); - /* 805788EC */ void Draw(); - /* 805789E8 */ void Delete(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C6B8 */ void getObjectResName2Index(char const*, char const*); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct J3DModel {}; - -struct dComIfG_play_c { - /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); - /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); - /* 8002CB68 */ void entrySimpleModel(J3DModel*, int); -}; - -struct dBgW_Base {}; - -struct dBgW {}; -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS_LinChk {}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); - /* 800743B4 */ void LineCross(cBgS_LinChk*); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct Hahen_c { - /* 80577794 */ Hahen_c(); - /* 805777A4 */ void Wall_Check(); - /* 80577868 */ void HahenMotion(); - /* 80577C1C */ void CheckCull(); - /* 80577DA4 */ void checkViewArea(); - /* 80577FE0 */ void Roll_Set(cXyz*, f32, s16); - /* 80578744 */ ~Hahen_c(); -}; // // Forward References: @@ -243,8 +104,6 @@ extern "C" void SetC__8cM3dGCylFRC4cXyz(); extern "C" void cLib_targetAngleY__FPC3VecPC3Vec(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void __construct_array(); extern "C" void _savegpr_23(); extern "C" void _savegpr_26(); @@ -256,8 +115,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -265,8 +122,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -846,25 +701,30 @@ SECTION_DEAD static char const* const stringBase_80578BDC = "Lv9_R07_pillar.dzb" #pragma pop /* 80578BF4-80578C14 -00001 0020+00 1/0 0/0 0/0 .data l_daObjBHASHI_Method */ -SECTION_DATA static void* l_daObjBHASHI_Method[8] = { - (void*)daObjBHASHI_Create__FP10fopAc_ac_c, - (void*)daObjBHASHI_Delete__FP13daObjBHASHI_c, - (void*)daObjBHASHI_Execute__FP13daObjBHASHI_c, - (void*)daObjBHASHI_IsDelete__FP13daObjBHASHI_c, - (void*)daObjBHASHI_Draw__FP13daObjBHASHI_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjBHASHI_Method = { + (process_method_func)daObjBHASHI_Create__FP10fopAc_ac_c, + (process_method_func)daObjBHASHI_Delete__FP13daObjBHASHI_c, + (process_method_func)daObjBHASHI_Execute__FP13daObjBHASHI_c, + (process_method_func)daObjBHASHI_IsDelete__FP13daObjBHASHI_c, + (process_method_func)daObjBHASHI_Draw__FP13daObjBHASHI_c, }; /* 80578C14-80578C44 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_BHASHI */ -SECTION_DATA extern void* g_profile_Obj_BHASHI[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x006C0000, (void*)&g_fpcLf_Method, - (void*)0x00001464, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01CF0000, (void*)&l_daObjBHASHI_Method, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_BHASHI = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_BHASHI, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjBHASHI_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 463, // mPriority + &l_daObjBHASHI_Method, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80578C44-80578C50 000054 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ diff --git a/rel/d/a/obj/d_a_obj_bhbridge/d_a_obj_bhbridge.cpp b/rel/d/a/obj/d_a_obj_bhbridge/d_a_obj_bhbridge.cpp index cd334f155f5..489a3b9e9d8 100644 --- a/rel/d/a/obj/d_a_obj_bhbridge/d_a_obj_bhbridge.cpp +++ b/rel/d/a/obj/d_a_obj_bhbridge/d_a_obj_bhbridge.cpp @@ -1,133 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_bhbridge -// +/** + * @file d_a_obj_bhbridge.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_bhbridge/d_a_obj_bhbridge.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct fopAcM_wt_c { - /* 8001DD84 */ void waterCheck(cXyz const*); - - static f32 mWaterY[1 + 1 /* padding */]; -}; - -struct daObjBhbridge_c { - /* 80BB5318 */ void RideOn_Angle(s16&, f32, s16, f32); - /* 80BB5380 */ void Check_RideOn(); - /* 80BB558C */ void initBaseMtx(); - /* 80BB55B8 */ void setBaseMtx(); - /* 80BB5934 */ void CreateHeap(); - /* 80BB59AC */ void Create(); - /* 80BB5A14 */ void Execute(f32 (**)[3][4]); - /* 80BB5E10 */ void Draw(); - /* 80BB5EB4 */ void Delete(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C6B8 */ void getObjectResName2Index(char const*, char const*); -}; - -struct dBgW {}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjGndChk_Spl { - /* 800777B0 */ dBgS_ObjGndChk_Spl(); - /* 80077848 */ ~dBgS_ObjGndChk_Spl(); -}; - -struct dBgS_ObjAcch { - /* 80BB58C4 */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); -}; - -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; - -struct cBgS { - /* 800744A0 */ void GroundCross(cBgS_GndChk*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -194,22 +72,15 @@ extern "C" void cLib_targetAngleY__FPC3VecPC3Vec(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSVECSquareDistance(); extern "C" void _savegpr_26(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -414,25 +285,30 @@ SECTION_DEAD static char const* const stringBase_80BB5F8D = "M_BHbridge.dzb"; SECTION_DATA static void* l_arcName = (void*)&d_a_obj_bhbridge__stringBase0; /* 80BB5FB0-80BB5FD0 -00001 0020+00 1/0 0/0 0/0 .data l_daObjBhbridge_Method */ -SECTION_DATA static void* l_daObjBhbridge_Method[8] = { - (void*)daObjBhbridge_Create__FP10fopAc_ac_c, - (void*)daObjBhbridge_Delete__FP15daObjBhbridge_c, - (void*)daObjBhbridge_Execute__FP15daObjBhbridge_c, - (void*)daObjBhbridge_IsDelete__FP15daObjBhbridge_c, - (void*)daObjBhbridge_Draw__FP15daObjBhbridge_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjBhbridge_Method = { + (process_method_func)daObjBhbridge_Create__FP10fopAc_ac_c, + (process_method_func)daObjBhbridge_Delete__FP15daObjBhbridge_c, + (process_method_func)daObjBhbridge_Execute__FP15daObjBhbridge_c, + (process_method_func)daObjBhbridge_IsDelete__FP15daObjBhbridge_c, + (process_method_func)daObjBhbridge_Draw__FP15daObjBhbridge_c, }; /* 80BB5FD0-80BB6000 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Bhbridge */ -SECTION_DATA extern void* g_profile_Obj_Bhbridge[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00690000, (void*)&g_fpcLf_Method, - (void*)0x00000810, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01CB0000, (void*)&l_daObjBhbridge_Method, - (void*)0x00040180, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Bhbridge = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Bhbridge, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjBhbridge_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 459, // mPriority + &l_daObjBhbridge_Method, // sub_method + 0x00040180, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BB6000-80BB6024 000054 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ @@ -476,7 +352,8 @@ static asm void daObjBhbridge_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bhbridge/d_a_obj_bhbridge/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.cpp b/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.cpp index 6754e2ea12b..e73211a1a2c 100644 --- a/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.cpp +++ b/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_bkdoor -// +/** + * @file d_a_obj_bkdoor.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.h" diff --git a/rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock.cpp b/rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock.cpp index 672c74c91d5..b72eaa2a008 100644 --- a/rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock.cpp +++ b/rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock.cpp @@ -1,198 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_bky_rock -// +/** + * @file d_a_obj_bky_rock.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct cXyz {}; - -struct fopAcM_wt_c { - /* 8001DD84 */ void waterCheck(cXyz const*); - - static f32 mWaterY[1 + 1 /* padding */]; -}; - -struct daBkyRock_c { - struct _pieceData { - /* 80BB6914 */ _pieceData(); - }; - - /* 80BB6858 */ daBkyRock_c(); - /* 80BB6B5C */ ~daBkyRock_c(); - /* 80BB6C4C */ void create(); - /* 80BB6D60 */ void execute(); - /* 80BB6D84 */ void draw(); - /* 80BB6EB8 */ void Delete(); - /* 80BB6F64 */ void setModelMtx(); - /* 80BB6FD4 */ void createHeap(); - /* 80BB7144 */ void init(); - /* 80BB72FC */ void middleExe(); - /* 80BB7364 */ void exeModeNoDamage(); - /* 80BB7458 */ void exeModeDamage(); - /* 80BB75D8 */ void exeModePiece(); - /* 80BB7690 */ void chkHitBombArrow(); - /* 80BB776C */ void initChangeModeBefore(); - /* 80BB77FC */ void initChangeModeAfter(); - /* 80BB7818 */ void pieceMove(); - /* 80BB7988 */ void pieceMoveInit(); - /* 80BB7C18 */ void callBombEmt(int, u16 const*); - - static u8 const s_CcDCyl[68]; - static u8 s_exeProc[36]; -}; - -struct dVibration_c { - /* 8006FB10 */ void StartQuake(int, int, cXyz); - /* 8006FD94 */ void StopQuake(int); - /* 8006FE5C */ void CheckQuake(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dMdl_obj_c {}; - -struct dMdl_mng_c { - /* 8009C8D8 */ void entry(J3DModelData*, u16, int); -}; - -struct dMdl_c { - /* 8009C668 */ void entryObj(dMdl_obj_c*); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80BB6B00 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 800844F8 */ void GetTgHitObj(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); - /* 80BB6920 */ ~dCcD_Cyl(); - /* 80BB69EC */ dCcD_Cyl(); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80BB6A70 */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80BB6AB8 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80BB7E04 */ ~cCcD_GStts(); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; - // // Forward References: // @@ -237,7 +50,6 @@ extern "C" u8 s_exeProc__11daBkyRock_c[36]; // External References: // -SECTION_INIT void memset(); extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoMtx_ZrotM__FPA4_fs(); extern "C" void scaleM__14mDoMtx_stack_cFfff(); @@ -286,8 +98,6 @@ extern "C" void cLib_addCalc__FPfffff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void __ptmf_test(); @@ -304,8 +114,6 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -313,7 +121,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -397,25 +204,30 @@ SECTION_DATA u8 daBkyRock_c::s_exeProc[36] = { }; /* 80BB8088-80BB80A8 -00001 0020+00 1/0 0/0 0/0 .data daBkyRock_METHODS */ -SECTION_DATA static void* daBkyRock_METHODS[8] = { - (void*)daBkyRock_create__FP11daBkyRock_c, - (void*)daBkyRock_Delete__FP11daBkyRock_c, - (void*)daBkyRock_execute__FP11daBkyRock_c, - (void*)NULL, - (void*)daBkyRock_draw__FP11daBkyRock_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daBkyRock_METHODS = { + (process_method_func)daBkyRock_create__FP11daBkyRock_c, + (process_method_func)daBkyRock_Delete__FP11daBkyRock_c, + (process_method_func)daBkyRock_execute__FP11daBkyRock_c, + 0, + (process_method_func)daBkyRock_draw__FP11daBkyRock_c, }; /* 80BB80A8-80BB80D8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_BkyRock */ -SECTION_DATA extern void* g_profile_BkyRock[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01030000, (void*)&g_fpcLf_Method, - (void*)0x00000F50, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02D80000, (void*)&daBkyRock_METHODS, - (void*)0x00044100, (void*)0x030E0000, +extern actor_process_profile_definition g_profile_BkyRock = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_BkyRock, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daBkyRock_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 728, // mPriority + &daBkyRock_METHODS, // sub_method + 0x00044100, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BB80D8-80BB80E4 0000BC 000C+00 2/2 0/0 0/0 .data __vt__11daBkyRock_c */ @@ -479,7 +291,8 @@ SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Cyl::~dCcD_Cyl() { +// asm dCcD_Cyl::~dCcD_Cyl() { +extern "C" asm void __dt__8dCcD_CylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock/__dt__8dCcD_CylFv.s" } @@ -489,7 +302,8 @@ asm dCcD_Cyl::~dCcD_Cyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Cyl::dCcD_Cyl() { +// asm dCcD_Cyl::dCcD_Cyl() { +extern "C" asm void __ct__8dCcD_CylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock/__ct__8dCcD_CylFv.s" } @@ -499,7 +313,8 @@ asm dCcD_Cyl::dCcD_Cyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock/__dt__8cM3dGCylFv.s" } @@ -509,7 +324,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock/__dt__8cM3dGAabFv.s" } @@ -519,7 +335,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock/__dt__10dCcD_GSttsFv.s" } @@ -1059,7 +876,8 @@ static asm void daBkyRock_draw(daBkyRock_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_bmshutter/d_a_obj_bmshutter.cpp b/rel/d/a/obj/d_a_obj_bmshutter/d_a_obj_bmshutter.cpp index 1a20b1d88d1..7c524f7ce3f 100644 --- a/rel/d/a/obj/d_a_obj_bmshutter/d_a_obj_bmshutter.cpp +++ b/rel/d/a/obj/d_a_obj_bmshutter/d_a_obj_bmshutter.cpp @@ -1,115 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_bmshutter -// +/** + * @file d_a_obj_bmshutter.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_bmshutter/d_a_obj_bmshutter.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjBmSh_c { - /* 80BB9A58 */ void initBaseMtx(); - /* 80BB9AE4 */ void setBaseMtx(); - /* 80BB9B84 */ void Create(); - /* 80BB9C50 */ void CreateHeap(); - /* 80BB9CC0 */ void create(); - /* 80BB9DB4 */ void Execute(f32 (**)[3][4]); - /* 80BB9F34 */ void checkSw(); - /* 80BB9FBC */ void checkAnySw(); - /* 80BBA044 */ void checkMySw(); - /* 80BBA080 */ void event_proc_call(); - /* 80BBA13C */ void actionWait(); - /* 80BBA1A4 */ void actionOrderEvent(); - /* 80BBA20C */ void actionEvent(); - /* 80BBA268 */ void actionDead(); - /* 80BBA26C */ void mode_proc_call(); - /* 80BBA394 */ void modeWait(); - /* 80BBA5B4 */ void modeMove(); - /* 80BBA640 */ void modeEnd(); - /* 80BBA644 */ void Draw(); - /* 80BBA6E8 */ void Delete(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dEvent_manager_c { - /* 80047698 */ void getEventIdx(fopAc_ac_c*, u8); - /* 80047A78 */ void endCheck(s16); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -176,20 +72,13 @@ extern "C" void cLib_addCalc__FPfffff(); extern "C" void cLib_addCalc0__FPfff(); extern "C" void cLib_addCalcAngleS2__FPssss(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_27(); extern "C" void _savegpr_29(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 struct_80BBA970[4]; @@ -390,25 +279,30 @@ SECTION_DATA static u8 l_func_3894[36] = { #pragma pop /* 80BBA8F8-80BBA918 -00001 0020+00 1/0 0/0 0/0 .data l_daObjBmSh_Method */ -SECTION_DATA static void* l_daObjBmSh_Method[8] = { - (void*)daObjBmSh_Create__FP10fopAc_ac_c, - (void*)daObjBmSh_Delete__FP11daObjBmSh_c, - (void*)daObjBmSh_Execute__FP11daObjBmSh_c, - (void*)NULL, - (void*)daObjBmSh_Draw__FP11daObjBmSh_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjBmSh_Method = { + (process_method_func)daObjBmSh_Create__FP10fopAc_ac_c, + (process_method_func)daObjBmSh_Delete__FP11daObjBmSh_c, + (process_method_func)daObjBmSh_Execute__FP11daObjBmSh_c, + 0, + (process_method_func)daObjBmSh_Draw__FP11daObjBmSh_c, }; /* 80BBA918-80BBA948 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_BoomShutter */ -SECTION_DATA extern void* g_profile_Obj_BoomShutter[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x005F0000, (void*)&g_fpcLf_Method, - (void*)0x000005DC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01C10000, (void*)&l_daObjBmSh_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_BoomShutter = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_BoomShutter, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjBmSh_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 449, // mPriority + &l_daObjBmSh_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BBA948-80BBA970 00011C 0028+00 1/1 0/0 0/0 .data __vt__11daObjBmSh_c */ diff --git a/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp b/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp index 11a82e62447..2e273b6aa30 100644 --- a/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp +++ b/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp @@ -9,13 +9,6 @@ #include "d/d_procname.h" #include "dol2asm.h" -// -// Types: -// - -struct daObjLife_c { - /* 8057B320 */ void setPos(cXyz); -}; // // Forward References: @@ -1055,7 +1048,8 @@ extern "C" asm void func_8057B304(void* _this, int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjLife_c::setPos(cXyz param_0) { +// asm void daObjLife_c::setPos(cXyz param_0) { +extern "C" asm void setPos__11daObjLife_cF4cXyz() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/setPos__11daObjLife_cF4cXyz.s" } diff --git a/rel/d/a/obj/d_a_obj_boumato/d_a_obj_boumato.cpp b/rel/d/a/obj/d_a_obj_boumato/d_a_obj_boumato.cpp index 57f36d4b352..117fc7ac466 100644 --- a/rel/d/a/obj/d_a_obj_boumato/d_a_obj_boumato.cpp +++ b/rel/d/a/obj/d_a_obj_boumato/d_a_obj_boumato.cpp @@ -1,154 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_boumato -// +/** + * @file d_a_obj_boumato.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_boumato/d_a_obj_boumato.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz { - /* 80BBB1F4 */ ~csXyz(); - /* 80BBB558 */ csXyz(); -}; - -struct mDoMtx_stack_c { - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObj_BouMato_c { - /* 80BBAFEC */ ~daObj_BouMato_c(); - /* 80BBB230 */ void create(); - /* 80BBB770 */ void CreateHeap(); - /* 80BBB800 */ void Delete(); - /* 80BBB834 */ void Execute(); - /* 80BBBD80 */ void Draw(); - /* 80BBBE50 */ void createHeapCallBack(fopAc_ac_c*); - /* 80BBBE70 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); - /* 80BBBEA0 */ void srchArrow(void*, void*); - /* 80BBBF4C */ void deleteStuckArrow(); - /* 80BBBFF8 */ void getResName(); - /* 80BBC008 */ void setSwayParam(fopAc_ac_c*); - /* 80BBC19C */ void setEnvTevColor(); - /* 80BBC1F8 */ void setRoomNo(); - /* 80BBC23C */ void setMtx(); -}; - -struct daObj_BouMato_Param_c { - /* 80BBC404 */ ~daObj_BouMato_Param_c(); - - static u8 const m[28]; -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct J3DModel {}; - -struct dJntColData_c {}; - -struct dJntCol_c { - /* 80035C8C */ dJntCol_c(); - /* 80035CA0 */ void init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dEvent_manager_c { - /* 80047A78 */ void endCheck(s16); - /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int); - /* 8004817C */ void cutEnd(int); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80BBB700 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80BBB634 */ ~dBgS_AcchCir(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct dBgS { - /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_GndChk { - /* 80267C1C */ cBgS_GndChk(); - /* 80267C94 */ ~cBgS_GndChk(); -}; - -struct _GXTexObj {}; - -struct JMath { - static u8 sincosTable_[65536]; -}; // // Forward References: @@ -261,9 +120,6 @@ extern "C" void SetR__8cM3dGCylFf(); extern "C" void cLib_addCalc2__FPffff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void _savegpr_25(); @@ -272,8 +128,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_25(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -282,7 +136,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -331,25 +184,30 @@ SECTION_DATA static void* jntCoData[3] = { }; /* 80BBC598-80BBC5B8 -00001 0020+00 1/0 0/0 0/0 .data daObj_BouMato_MethodTable */ -SECTION_DATA static void* daObj_BouMato_MethodTable[8] = { - (void*)daObj_BouMato_Create__FPv, - (void*)daObj_BouMato_Delete__FPv, - (void*)daObj_BouMato_Execute__FPv, - (void*)daObj_BouMato_IsDelete__FPv, - (void*)daObj_BouMato_Draw__FPv, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObj_BouMato_MethodTable = { + (process_method_func)daObj_BouMato_Create__FPv, + (process_method_func)daObj_BouMato_Delete__FPv, + (process_method_func)daObj_BouMato_Execute__FPv, + (process_method_func)daObj_BouMato_IsDelete__FPv, + (process_method_func)daObj_BouMato_Draw__FPv, }; /* 80BBC5B8-80BBC5E8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_BOUMATO */ -SECTION_DATA extern void* g_profile_OBJ_BOUMATO[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x012D0000, (void*)&g_fpcLf_Method, - (void*)0x00000A40, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00500000, (void*)&daObj_BouMato_MethodTable, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_BOUMATO = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_BOUMATO, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObj_BouMato_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 80, // mPriority + &daObj_BouMato_MethodTable, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BBC5E8-80BBC60C 0000BC 0024+00 3/3 0/0 0/0 .data __vt__12dBgS_ObjAcch */ @@ -428,7 +286,8 @@ asm daObj_BouMato_c::~daObj_BouMato_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm csXyz::~csXyz() { +// asm csXyz::~csXyz() { +extern "C" asm void __dt__5csXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_boumato/d_a_obj_boumato/__dt__5csXyzFv.s" } @@ -489,7 +348,8 @@ asm void daObj_BouMato_c::create() { #pragma pop /* 80BBB558-80BBB55C 000658 0004+00 1/1 0/0 0/0 .text __ct__5csXyzFv */ -csXyz::csXyz() { +// csXyz::csXyz() { +extern "C" asm void __ct__5csXyzFv() { /* empty function */ } @@ -530,7 +390,8 @@ extern "C" asm void __dt__8cM3dGAabFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_boumato/d_a_obj_boumato/__dt__12dBgS_AcchCirFv.s" } @@ -551,7 +412,8 @@ extern "C" asm void __dt__10dCcD_GSttsFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_boumato/d_a_obj_boumato/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.cpp b/rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.cpp index 8b32c5af605..93e9d813a8f 100644 --- a/rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.cpp +++ b/rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.cpp @@ -1,106 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_brakeeff -// +/** + * @file d_a_obj_brakeeff.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_brakeeff_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dCcU_AtInfo {}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS_PolyInfo {}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 8046E2B0 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -163,14 +69,10 @@ extern "C" void SetC__8cM3dGSphFRC4cXyz(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void _savegpr_24(); extern "C" void _savegpr_29(); extern "C" void _restgpr_24(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; @@ -178,7 +80,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; // // Declarations: @@ -318,25 +219,30 @@ static dCcD_SrcSph cc_sph_src = { }; /* 8046E59C-8046E5BC -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Brakeeff_Method */ -SECTION_DATA static void* l_daObj_Brakeeff_Method[8] = { - (void*)daObj_Brakeeff_Create__FP10fopAc_ac_c, - (void*)daObj_Brakeeff_Delete__FP18obj_brakeeff_class, - (void*)daObj_Brakeeff_Execute__FP18obj_brakeeff_class, - (void*)daObj_Brakeeff_IsDelete__FP18obj_brakeeff_class, - (void*)daObj_Brakeeff_Draw__FP18obj_brakeeff_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObj_Brakeeff_Method = { + (process_method_func)daObj_Brakeeff_Create__FP10fopAc_ac_c, + (process_method_func)daObj_Brakeeff_Delete__FP18obj_brakeeff_class, + (process_method_func)daObj_Brakeeff_Execute__FP18obj_brakeeff_class, + (process_method_func)daObj_Brakeeff_IsDelete__FP18obj_brakeeff_class, + (process_method_func)daObj_Brakeeff_Draw__FP18obj_brakeeff_class, }; /* 8046E5BC-8046E5EC -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_BEF */ -SECTION_DATA extern void* g_profile_OBJ_BEF[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00250000, (void*)&g_fpcLf_Method, - (void*)0x0000073C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00270000, (void*)&l_daObj_Brakeeff_Method, - (void*)0x00040100, (void*)0x00070000, +extern actor_process_profile_definition g_profile_OBJ_BEF = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_BEF, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(obj_brakeeff_class), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 39, // mPriority + &l_daObj_Brakeeff_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_7_e, // cullType }; /* 8046E5EC-8046E5F8 0000AC 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGSph */ @@ -374,7 +280,8 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.cpp b/rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.cpp index 13d8610eb42..717a4054dfa 100644 --- a/rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.cpp +++ b/rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.cpp @@ -1,114 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_brg -// +/** + * @file d_a_obj_brg.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_brg_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoExt_3DlineMat_c {}; - -struct mDoExt_3DlineMatSortPacket { - /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); -}; - -struct ResTIMG {}; - -struct _GXColor {}; - -struct dKy_tevstr_c {}; - -struct mDoExt_3DlineMat1_c { - /* 80013360 */ void init(u16, u16, ResTIMG*, int); - /* 8001373C */ void update(int, f32, _GXColor&, u16, dKy_tevstr_c*); - /* 80013FB0 */ void update(int, _GXColor&, dKy_tevstr_c*); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dCcU_AtInfo {}; - -struct dBgW_Base {}; - -struct cBgD_t {}; - -struct dBgWSv { - /* 80082F98 */ void Set(cBgD_t*, u32); - /* 80083020 */ void CopyBackVtx(); -}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct br_s { - /* 80BC1F54 */ ~br_s(); - /* 80BC2000 */ br_s(); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; - -struct J3DLightObj { - /* 80BC20FC */ J3DLightObj(); -}; - -struct J3DLightInfo { - /* 803256C4 */ void operator=(J3DLightInfo const&); -}; // // Forward References: @@ -204,8 +103,6 @@ extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void __as__12J3DLightInfoFRC12J3DLightInfo(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void __cvt_fp2unsigned(); @@ -225,10 +122,7 @@ extern "C" void _restgpr_24(); extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); -extern "C" extern u8 const j3dDefaultLightInfo[52]; extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__6dBgWSv[65 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -237,8 +131,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -1562,25 +1454,30 @@ SECTION_DEAD static char const* const stringBase_80BC239C = "D_MN05"; #pragma pop /* 80BC2460-80BC2480 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Brg_Method */ -SECTION_DATA static void* l_daObj_Brg_Method[8] = { - (void*)daObj_Brg_Create__FP10fopAc_ac_c, - (void*)daObj_Brg_Delete__FP13obj_brg_class, - (void*)daObj_Brg_Execute__FP13obj_brg_class, - (void*)daObj_Brg_IsDelete__FP13obj_brg_class, - (void*)daObj_Brg_Draw__FP13obj_brg_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObj_Brg_Method = { + (process_method_func)daObj_Brg_Create__FP10fopAc_ac_c, + (process_method_func)daObj_Brg_Delete__FP13obj_brg_class, + (process_method_func)daObj_Brg_Execute__FP13obj_brg_class, + (process_method_func)daObj_Brg_IsDelete__FP13obj_brg_class, + (process_method_func)daObj_Brg_Draw__FP13obj_brg_class, }; /* 80BC2480-80BC24B0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_BRG */ -SECTION_DATA extern void* g_profile_OBJ_BRG[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x002C0000, (void*)&g_fpcLf_Method, - (void*)0x0000B1F8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00360000, (void*)&l_daObj_Brg_Method, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_BRG = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_BRG, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(obj_brg_class), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 54, // mPriority + &l_daObj_Brg_Method, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BC24B0-80BC24BC 00010C 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */ @@ -1818,7 +1715,8 @@ asm br_s::br_s() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DLightObj::J3DLightObj() { +// asm J3DLightObj::J3DLightObj() { +extern "C" asm void __ct__11J3DLightObjFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_brg/d_a_obj_brg/__ct__11J3DLightObjFv.s" } diff --git a/rel/d/a/obj/d_a_obj_bubblePilar/d_a_obj_bubblePilar.cpp b/rel/d/a/obj/d_a_obj_bubblePilar/d_a_obj_bubblePilar.cpp index 9b668dd1afe..9a4058fac13 100644 --- a/rel/d/a/obj/d_a_obj_bubblePilar/d_a_obj_bubblePilar.cpp +++ b/rel/d/a/obj/d_a_obj_bubblePilar/d_a_obj_bubblePilar.cpp @@ -1,167 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_bubblePilar -// +/** + * @file d_a_obj_bubblePilar.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_bubblePilar/d_a_obj_bubblePilar.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80BC3418 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct daBubbPilar_c { - /* 80BC3460 */ void setBaseMtx(); - /* 80BC3518 */ void CreateHeap(); - /* 80BC35D0 */ void create(); - /* 80BC3934 */ void Execute(f32 (**)[3][4]); - /* 80BC3AB8 */ void initModeWait(); - /* 80BC3AC4 */ void modeWait(); - /* 80BC3C74 */ void initModeEffOn(); - /* 80BC3C98 */ void modeEffOn(); - /* 80BC3DB0 */ void Draw(); - /* 80BC3E8C */ void Delete(); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; -}; - -struct daBubbPilar_HIO_c { - /* 80BC33EC */ daBubbPilar_HIO_c(); - /* 80BC3F90 */ ~daBubbPilar_HIO_c(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80BC38D8 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 80084548 */ void GetTgHitGObj(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct dBgW_Base {}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80BC3848 */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80BC3890 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80BC3F48 */ ~cCcD_GStts(); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -238,8 +83,6 @@ extern "C" void SetH__8cM3dGCylFf(); extern "C" void SetR__8cM3dGCylFf(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_24(); extern "C" void _savegpr_28(); @@ -247,8 +90,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_24(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -256,8 +97,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -323,25 +162,30 @@ SECTION_DATA static u8 mode_proc[24] = { #pragma pop /* 80BC4150-80BC4170 -00001 0020+00 1/0 0/0 0/0 .data l_daBubbPilar_Method */ -SECTION_DATA static void* l_daBubbPilar_Method[8] = { - (void*)daBubbPilar_Create__FP10fopAc_ac_c, - (void*)daBubbPilar_Delete__FP13daBubbPilar_c, - (void*)daBubbPilar_Execute__FP13daBubbPilar_c, - (void*)NULL, - (void*)daBubbPilar_Draw__FP13daBubbPilar_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daBubbPilar_Method = { + (process_method_func)daBubbPilar_Create__FP10fopAc_ac_c, + (process_method_func)daBubbPilar_Delete__FP13daBubbPilar_c, + (process_method_func)daBubbPilar_Execute__FP13daBubbPilar_c, + 0, + (process_method_func)daBubbPilar_Draw__FP13daBubbPilar_c, }; /* 80BC4170-80BC41A0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_awaPlar */ -SECTION_DATA extern void* g_profile_Obj_awaPlar[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01920000, (void*)&g_fpcLf_Method, - (void*)0x00000750, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02930000, (void*)&l_daBubbPilar_Method, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_awaPlar = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_awaPlar, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daBubbPilar_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 659, // mPriority + &l_daBubbPilar_Method, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BC41A0-80BC41AC 0000E4 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -414,7 +258,8 @@ asm daBubbPilar_HIO_c::daBubbPilar_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bubblePilar/d_a_obj_bubblePilar/__dt__14mDoHIO_entry_cFv.s" } @@ -474,7 +319,8 @@ asm void daBubbPilar_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bubblePilar/d_a_obj_bubblePilar/__dt__8cM3dGCylFv.s" } @@ -484,7 +330,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bubblePilar/d_a_obj_bubblePilar/__dt__8cM3dGAabFv.s" } @@ -494,7 +341,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bubblePilar/d_a_obj_bubblePilar/__dt__10dCcD_GSttsFv.s" } @@ -660,7 +508,8 @@ static asm void daBubbPilar_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bubblePilar/d_a_obj_bubblePilar/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_burnbox/d_a_obj_burnbox.cpp b/rel/d/a/obj/d_a_obj_burnbox/d_a_obj_burnbox.cpp index 5cd7056f731..d40a8257fdb 100644 --- a/rel/d/a/obj/d_a_obj_burnbox/d_a_obj_burnbox.cpp +++ b/rel/d/a/obj/d_a_obj_burnbox/d_a_obj_burnbox.cpp @@ -1,86 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_burnbox -// +/** + * @file d_a_obj_burnbox.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_burnbox/d_a_obj_burnbox.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjBurnBox_c { - /* 8046E698 */ void initBaseMtx(); - /* 8046E6D4 */ void setBaseMtx(); - /* 8046E738 */ void Create(); - /* 8046E8BC */ void CreateHeap(); - /* 8046E93C */ void create1st(); - /* 8046E9EC */ void Execute(f32 (**)[3][4]); - /* 8046EABC */ void Draw(); - /* 8046EC10 */ void Delete(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct J3DModel {}; // // Forward References: @@ -135,13 +61,10 @@ extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP extern "C" void Set__4cCcSFP8cCcD_Obj(); extern "C" void SetC__8cM3dGCylFRC4cXyz(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); extern "C" void _savegpr_25(); extern "C" void _savegpr_28(); extern "C" void _restgpr_25(); extern "C" void _restgpr_28(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -149,8 +72,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; // // Declarations: @@ -334,25 +255,30 @@ asm void daObjBurnBox_c::Delete() { /* ############################################################################################## */ /* 8046EEE0-8046EF00 -00001 0020+00 1/0 0/0 0/0 .data daObjBurnBox_METHODS */ -SECTION_DATA static void* daObjBurnBox_METHODS[8] = { - (void*)daObjBurnBox_create1st__FP14daObjBurnBox_c, - (void*)daObjBurnBox_MoveBGDelete__FP14daObjBurnBox_c, - (void*)daObjBurnBox_MoveBGExecute__FP14daObjBurnBox_c, - (void*)NULL, - (void*)daObjBurnBox_MoveBGDraw__FP14daObjBurnBox_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjBurnBox_METHODS = { + (process_method_func)daObjBurnBox_create1st__FP14daObjBurnBox_c, + (process_method_func)daObjBurnBox_MoveBGDelete__FP14daObjBurnBox_c, + (process_method_func)daObjBurnBox_MoveBGExecute__FP14daObjBurnBox_c, + 0, + (process_method_func)daObjBurnBox_MoveBGDraw__FP14daObjBurnBox_c, }; /* 8046EF00-8046EF30 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_BurnBox */ -SECTION_DATA extern void* g_profile_Obj_BurnBox[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00DC0000, (void*)&g_fpcLf_Method, - (void*)0x00000740, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02140000, (void*)&daObjBurnBox_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_BurnBox = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_BurnBox, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjBurnBox_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 532, // mPriority + &daObjBurnBox_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 8046EF30-8046EF3C 00005C 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ diff --git a/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp b/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp index 3379dc8f57c..2f59614c1f9 100644 --- a/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp +++ b/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp @@ -12,14 +12,6 @@ #include "SSystem/SComponent/c_math.h" #include "JSystem/JKernel/JKRHeap.h" -// -// Types: -// - -struct dTres_c { - /* 8009C3CC */ void setPosition(int, u8, Vec const*, int); -}; - // // Forward References: // diff --git a/rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.cpp b/rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.cpp index 42e9e2e8386..2e7fef95daf 100644 --- a/rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.cpp +++ b/rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_catdoor -// +/** + * @file d_a_obj_catdoor.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.h" #include "d/com/d_com_inf_game.h" diff --git a/rel/d/a/obj/d_a_obj_cb/d_a_obj_cb.cpp b/rel/d/a/obj/d_a_obj_cb/d_a_obj_cb.cpp index 6ac6793c832..5cc66698b2f 100644 --- a/rel/d/a/obj/d_a_obj_cb/d_a_obj_cb.cpp +++ b/rel/d/a/obj/d_a_obj_cb/d_a_obj_cb.cpp @@ -1,135 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_cb -// +/** + * @file d_a_obj_cb.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_cb/d_a_obj_cb.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_cb_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObj_Cb_HIO_c { - /* 80BC4B2C */ daObj_Cb_HIO_c(); - /* 80BC573C */ ~daObj_Cb_HIO_c(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct Vec {}; -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80BC56CC */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); -}; - -struct csXyz {}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGSph { - /* 80BC563C */ ~cM3dGSph(); -}; - -struct cM3dGAab { - /* 80BC5684 */ ~cM3dGAab(); -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS_PolyInfo {}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDFF8 */ void deleteObject(); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -201,14 +78,8 @@ extern "C" void deleteObject__14Z2SoundObjBaseFv(); extern "C" void __ct__16Z2SoundObjSimpleFv(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSVECAdd(); -extern "C" void PSVECSquareMag(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; @@ -216,9 +87,7 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -228,25 +97,30 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80BC5854-80BC5874 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Cb_Method */ -SECTION_DATA static void* l_daObj_Cb_Method[8] = { - (void*)daObj_Cb_Create__FP10fopAc_ac_c, - (void*)daObj_Cb_Delete__FP12obj_cb_class, - (void*)daObj_Cb_Execute__FP12obj_cb_class, - (void*)daObj_Cb_IsDelete__FP12obj_cb_class, - (void*)daObj_Cb_Draw__FP12obj_cb_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObj_Cb_Method = { + (process_method_func)daObj_Cb_Create__FP10fopAc_ac_c, + (process_method_func)daObj_Cb_Delete__FP12obj_cb_class, + (process_method_func)daObj_Cb_Execute__FP12obj_cb_class, + (process_method_func)daObj_Cb_IsDelete__FP12obj_cb_class, + (process_method_func)daObj_Cb_Draw__FP12obj_cb_class, }; /* 80BC5874-80BC58A4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_CB */ -SECTION_DATA extern void* g_profile_OBJ_CB[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x002A0000, (void*)&g_fpcLf_Method, - (void*)0x0000097C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00310000, (void*)&l_daObj_Cb_Method, - (void*)0x00040100, (void*)NULL, +extern actor_process_profile_definition g_profile_OBJ_CB = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_CB, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(obj_cb_class), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 49, // mPriority + &l_daObj_Cb_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_0_e, // cullType }; /* 80BC58A4-80BC58B0 000050 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGSph */ @@ -558,7 +432,8 @@ static asm void daObj_Cb_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { +// asm cM3dGSph::~cM3dGSph() { +extern "C" asm void __dt__8cM3dGSphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_cb/d_a_obj_cb/__dt__8cM3dGSphFv.s" } @@ -568,7 +443,8 @@ asm cM3dGSph::~cM3dGSph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_cb/d_a_obj_cb/__dt__8cM3dGAabFv.s" } @@ -578,7 +454,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_cb/d_a_obj_cb/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_cblock/d_a_obj_cblock.cpp b/rel/d/a/obj/d_a_obj_cblock/d_a_obj_cblock.cpp index a5654eee745..fdfa49aa465 100644 --- a/rel/d/a/obj/d_a_obj_cblock/d_a_obj_cblock.cpp +++ b/rel/d/a/obj/d_a_obj_cblock/d_a_obj_cblock.cpp @@ -1,89 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_cblock -// +/** + * @file d_a_obj_cblock.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_cblock/d_a_obj_cblock.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct fopAcM_lc_c { - /* 8001DC68 */ void lineCheck(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct daObjCBlk_c { - struct chain_s { - /* 80BC5E58 */ ~chain_s(); - /* 80BC5E94 */ chain_s(); - }; - - /* 80BC5A0C */ void initBaseMtx(); - /* 80BC5A48 */ void setBaseMtx(); - /* 80BC5ABC */ void Create(); - /* 80BC5CF8 */ void CreateHeap(); - /* 80BC5E98 */ void create(); - /* 80BC6260 */ void Execute(f32 (**)[3][4]); - /* 80BC6270 */ void initWait(); - /* 80BC627C */ void modeWait(); - /* 80BC6414 */ void initWalk(); - /* 80BC6430 */ void modeWalk(); - /* 80BC65CC */ void getChainBasePos(cXyz*); - /* 80BC6648 */ void setPower(f32); - /* 80BC66DC */ void checkWall(); - /* 80BC6868 */ bool Draw(); - /* 80BC6870 */ void Delete(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPath {}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModelData {}; // // Forward References: @@ -160,9 +83,6 @@ extern "C" void cM_atan2s__Fff(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nwa__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void __construct_array(); extern "C" void __construct_new_array(); extern "C" void _savegpr_25(); @@ -173,8 +93,6 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -369,25 +287,30 @@ SECTION_DATA static u8 l_func[24] = { #pragma pop /* 80BC6B9C-80BC6BBC -00001 0020+00 1/0 0/0 0/0 .data l_daObjCBlk_Method */ -SECTION_DATA static void* l_daObjCBlk_Method[8] = { - (void*)daObjCBlk_Create__FP10fopAc_ac_c, - (void*)daObjCBlk_Delete__FP11daObjCBlk_c, - (void*)daObjCBlk_Execute__FP11daObjCBlk_c, - (void*)NULL, - (void*)daObjCBlk_Draw__FP11daObjCBlk_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjCBlk_Method = { + (process_method_func)daObjCBlk_Create__FP10fopAc_ac_c, + (process_method_func)daObjCBlk_Delete__FP11daObjCBlk_c, + (process_method_func)daObjCBlk_Execute__FP11daObjCBlk_c, + 0, + (process_method_func)daObjCBlk_Draw__FP11daObjCBlk_c, }; /* 80BC6BBC-80BC6BEC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_ChainBlock */ -SECTION_DATA extern void* g_profile_Obj_ChainBlock[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x007E0000, (void*)&g_fpcLf_Method, - (void*)0x00000CA8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02550000, (void*)&l_daObjCBlk_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_ChainBlock = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_ChainBlock, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjCBlk_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 597, // mPriority + &l_daObjCBlk_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BC6BEC-80BC6BF8 000118 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ diff --git a/rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.cpp b/rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.cpp index 12783f1963a..630307abb4f 100644 --- a/rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.cpp +++ b/rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_crope -// +/** + * @file d_a_obj_crope.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.h" #include "d/cc/d_cc_d.h" @@ -230,25 +230,30 @@ SECTION_DATA static u8 color[4] = { }; /* 80BCEB80-80BCEBA0 -00001 0020+00 1/0 0/0 0/0 .data l_daObjCrope_Method */ -SECTION_DATA static void* l_daObjCrope_Method[8] = { - (void*)daObjCrope_Create__FP10fopAc_ac_c, - (void*)daObjCrope_Delete__FP12daObjCrope_c, - (void*)daObjCrope_Execute__FP12daObjCrope_c, - (void*)NULL, - (void*)daObjCrope_Draw__FP12daObjCrope_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjCrope_Method = { + (process_method_func)daObjCrope_Create__FP10fopAc_ac_c, + (process_method_func)daObjCrope_Delete__FP12daObjCrope_c, + (process_method_func)daObjCrope_Execute__FP12daObjCrope_c, + 0, + (process_method_func)daObjCrope_Draw__FP12daObjCrope_c, }; /* 80BCEBA0-80BCEBD0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Crope */ -SECTION_DATA extern void* g_profile_Obj_Crope[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02BE0000, (void*)&g_fpcLf_Method, - (void*)0x000010AC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00F80000, (void*)&l_daObjCrope_Method, - (void*)0x00040100, (void*)0x030E0000, +extern actor_process_profile_definition g_profile_Obj_Crope = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Crope, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjCrope_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 248, // mPriority + &l_daObjCrope_Method, // sub_method + 0x00040100, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BCEBD0-80BCEBDC 000094 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGLin */ diff --git a/rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence.cpp b/rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence.cpp index e66a8145495..233d35f60da 100644 --- a/rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence.cpp +++ b/rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence.cpp @@ -1,185 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_crvfence -// +/** + * @file d_a_obj_crvfence.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - -struct cXyz { - /* 80BCED24 */ ~cXyz(); - /* 80BCFFBC */ cXyz(); -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CE38 */ void scaleM(f32, f32, f32); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static f32 mGroundY; -}; - -struct daObjCRVFENCE_c { - /* 80BCEC98 */ void CheckVec(); - /* 80BCED60 */ void Wall_Check(cXyz, cXyz); - /* 80BCEE60 */ void BgRelease(); - /* 80BCEED0 */ void PosSet(cXyz*); - /* 80BCEF30 */ void FenceMove(u8&, cXyz*, csXyz*, cXyz*, s16&); - /* 80BCF0B0 */ void BrokenAction(); - /* 80BCF404 */ void NormalAction(); - /* 80BCF7DC */ void checkViewArea(cXyz*); - /* 80BCF860 */ void Action(); - /* 80BCF8A4 */ void setBaseMtx(); - /* 80BCF9E4 */ void CreateHeap(); - /* 80BCFAE4 */ void create(); - /* 80BCFFC8 */ void Create(); - /* 80BD000C */ void Execute(f32 (**)[3][4]); - /* 80BD0058 */ void Draw(); - /* 80BD013C */ void Delete(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C6B8 */ void getObjectResName2Index(char const*, char const*); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dCcD_Sph { - /* 80BCFD6C */ ~dCcD_Sph(); - /* 80BCFE38 */ dCcD_Sph(); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct dBgW_Base {}; - -struct dBgW {}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80BCFF4C */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); -}; - -struct cM3dGSph { - /* 80BCFEBC */ ~cM3dGSph(); -}; - -struct cM3dGAab { - /* 80BCFF04 */ ~cM3dGAab(); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS_LinChk {}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); - /* 800743B4 */ void LineCross(cBgS_LinChk*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -222,7 +48,6 @@ extern "C" extern char const* const d_a_obj_crvfence__stringBase0; // External References: // -extern "C" void OSReport(); extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); @@ -276,10 +101,6 @@ extern "C" void ChkUsed__9cBgW_BgIdCFv(); extern "C" void cLib_chaseAngleS__FPsss(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXInverse(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); extern "C" void __construct_array(); extern "C" void _savegpr_25(); extern "C" void _savegpr_28(); @@ -287,8 +108,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_25(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; @@ -296,8 +115,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -329,7 +146,8 @@ asm void daObjCRVFENCE_c::CheckVec() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence/__dt__4cXyzFv.s" } @@ -731,25 +549,30 @@ SECTION_DEAD static char const* const stringBase_80BD024E = "CaravanFence.dzb"; #pragma pop /* 80BD0264-80BD0284 -00001 0020+00 1/0 0/0 0/0 .data l_daObjCRVFENCE_Method */ -SECTION_DATA static void* l_daObjCRVFENCE_Method[8] = { - (void*)daObjCRVFENCE_Create__FP10fopAc_ac_c, - (void*)daObjCRVFENCE_Delete__FP15daObjCRVFENCE_c, - (void*)daObjCRVFENCE_Execute__FP15daObjCRVFENCE_c, - (void*)daObjCRVFENCE_IsDelete__FP15daObjCRVFENCE_c, - (void*)daObjCRVFENCE_Draw__FP15daObjCRVFENCE_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjCRVFENCE_Method = { + (process_method_func)daObjCRVFENCE_Create__FP10fopAc_ac_c, + (process_method_func)daObjCRVFENCE_Delete__FP15daObjCRVFENCE_c, + (process_method_func)daObjCRVFENCE_Execute__FP15daObjCRVFENCE_c, + (process_method_func)daObjCRVFENCE_IsDelete__FP15daObjCRVFENCE_c, + (process_method_func)daObjCRVFENCE_Draw__FP15daObjCRVFENCE_c, }; /* 80BD0284-80BD02B4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_CRVFENCE */ -SECTION_DATA extern void* g_profile_Obj_CRVFENCE[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00700000, (void*)&g_fpcLf_Method, - (void*)0x0000103C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01D30000, (void*)&l_daObjCRVFENCE_Method, - (void*)0x00040180, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_CRVFENCE = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_CRVFENCE, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjCRVFENCE_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 467, // mPriority + &l_daObjCRVFENCE_Method, // sub_method + 0x00040180, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BD02B4-80BD02C0 000054 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */ @@ -807,7 +630,8 @@ asm void daObjCRVFENCE_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Sph::~dCcD_Sph() { +// asm dCcD_Sph::~dCcD_Sph() { +extern "C" asm void __dt__8dCcD_SphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence/__dt__8dCcD_SphFv.s" } @@ -817,7 +641,8 @@ asm dCcD_Sph::~dCcD_Sph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Sph::dCcD_Sph() { +// asm dCcD_Sph::dCcD_Sph() { +extern "C" asm void __ct__8dCcD_SphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence/__ct__8dCcD_SphFv.s" } @@ -827,7 +652,8 @@ asm dCcD_Sph::dCcD_Sph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { +// asm cM3dGSph::~cM3dGSph() { +extern "C" asm void __dt__8cM3dGSphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence/__dt__8cM3dGSphFv.s" } @@ -837,7 +663,8 @@ asm cM3dGSph::~cM3dGSph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence/__dt__8cM3dGAabFv.s" } @@ -847,14 +674,16 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence/__dt__12dBgS_ObjAcchFv.s" } #pragma pop /* 80BCFFBC-80BCFFC0 00139C 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */ -cXyz::cXyz() { +// cXyz::cXyz() { +extern "C" asm void __ct__4cXyzFv() { /* empty function */ } diff --git a/rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate.cpp b/rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate.cpp index 6c1d4cdd25e..a4c48b2b5cf 100644 --- a/rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate.cpp +++ b/rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate.cpp @@ -1,208 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_crvgate -// +/** + * @file d_a_obj_crvgate.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate.h" #include "dol2asm.h" +#include "d/d_camera.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - -struct cXyz { - /* 80BD0844 */ ~cXyz(); - /* 80BD2E7C */ cXyz(); -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CDD4 */ void transM(cXyz const&); - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static f32 mGroundY; -}; - -struct daObjCRVGATE_c { - /* 80BD0398 */ void initCcCylinder(); - /* 80BD0500 */ void setCcCylinder(); - /* 80BD069C */ void checkOpen(); - /* 80BD0880 */ void actionStartEvent(); - /* 80BD0978 */ void actionWaitEvent(); - /* 80BD0A64 */ void Demo_Set(); - /* 80BD0B7C */ void SetOpen(); - /* 80BD0B88 */ void actionDemoEvent(); - /* 80BD0D28 */ void event_proc_call(); - /* 80BD0D90 */ void CheckVec(); - /* 80BD0E1C */ void KeyVib(); - /* 80BD0F9C */ void DoorVib(); - /* 80BD10C0 */ void VibStop(); - /* 80BD10D0 */ void CloseVibration(); - /* 80BD1110 */ void CloseAction(); - /* 80BD18E0 */ void OpenAction(); - /* 80BD21E4 */ void HakaiMotion(); - /* 80BD22C8 */ void DoorAction(); - /* 80BD2338 */ void B_CloseAction(); - /* 80BD245C */ void SetB_Close(); - /* 80BD2528 */ void setBaseMtx(); - /* 80BD2670 */ void CreateHeap(); - /* 80BD2758 */ void SetDoor(); - /* 80BD28C0 */ void create(); - /* 80BD2E88 */ void Create(); - /* 80BD2ECC */ void Execute(f32 (**)[3][4]); - /* 80BD2FB8 */ void Draw(); - /* 80BD3074 */ void Delete(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C6B8 */ void getObjectResName2Index(char const*, char const*); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcSph {}; - -struct dCcD_Sph { - /* 80084A34 */ void Set(dCcD_SrcSph const&); - /* 80BD2C74 */ ~dCcD_Sph(); - /* 80BD2D40 */ dCcD_Sph(); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 80084658 */ void ChkCoHit(); - /* 800846F0 */ void GetCoHitObj(); -}; - -struct dCamera_c { - /* 801614AC */ void Start(); - /* 801614D0 */ void Stop(); - /* 8016300C */ void SetTrimSize(s32); - /* 80180C18 */ void Reset(cXyz, cXyz); - /* 80181E64 */ void Eye(); - /* 80181E98 */ void Center(); -}; - -struct dBgW {}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80BD2E0C */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); -}; - -struct cM3dGSph { - /* 8026F648 */ void SetC(cXyz const&); - /* 80BD2DC4 */ ~cM3dGSph(); -}; - -struct cM3dGCyl { - /* 80BD2BE4 */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80BD2C2C */ ~cM3dGAab(); -}; - -struct cCcD_Obj { - /* 80263A48 */ void GetAc(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -321,12 +125,6 @@ extern "C" void cLib_targetAngleY__FPC3VecPC3Vec(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __ct__16Z2SoundObjSimpleFv(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXInverse(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECScale(); -extern "C" void PSVECSquareMag(); -extern "C" void PSVECSquareDistance(); extern "C" void __construct_array(); extern "C" void _savegpr_21(); extern "C" void _savegpr_23(); @@ -340,9 +138,6 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void abs(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -352,10 +147,7 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -514,7 +306,8 @@ asm void daObjCRVGATE_c::checkOpen() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate/__dt__4cXyzFv.s" } @@ -960,25 +753,30 @@ SECTION_DEAD static char const* const stringBase_80BD31E3 = "CaravanGate.dzb"; #pragma pop /* 80BD31F8-80BD3218 -00001 0020+00 1/0 0/0 0/0 .data l_daObjCRVGATE_Method */ -SECTION_DATA static void* l_daObjCRVGATE_Method[8] = { - (void*)daObjCRVGATE_Create__FP10fopAc_ac_c, - (void*)daObjCRVGATE_Delete__FP14daObjCRVGATE_c, - (void*)daObjCRVGATE_Execute__FP14daObjCRVGATE_c, - (void*)daObjCRVGATE_IsDelete__FP14daObjCRVGATE_c, - (void*)daObjCRVGATE_Draw__FP14daObjCRVGATE_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjCRVGATE_Method = { + (process_method_func)daObjCRVGATE_Create__FP10fopAc_ac_c, + (process_method_func)daObjCRVGATE_Delete__FP14daObjCRVGATE_c, + (process_method_func)daObjCRVGATE_Execute__FP14daObjCRVGATE_c, + (process_method_func)daObjCRVGATE_IsDelete__FP14daObjCRVGATE_c, + (process_method_func)daObjCRVGATE_Draw__FP14daObjCRVGATE_c, }; /* 80BD3218-80BD3248 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_CRVGATE */ -SECTION_DATA extern void* g_profile_Obj_CRVGATE[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x006F0000, (void*)&g_fpcLf_Method, - (void*)0x00000DE4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01D20000, (void*)&l_daObjCRVGATE_Method, - (void*)0x00040180, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_CRVGATE = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_CRVGATE, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjCRVGATE_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 466, // mPriority + &l_daObjCRVGATE_Method, // sub_method + 0x00040180, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BD3248-80BD3254 000054 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGSph */ @@ -1043,7 +841,8 @@ asm void daObjCRVGATE_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate/__dt__8cM3dGCylFv.s" } @@ -1053,7 +852,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate/__dt__8cM3dGAabFv.s" } @@ -1063,7 +863,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Sph::~dCcD_Sph() { +// asm dCcD_Sph::~dCcD_Sph() { +extern "C" asm void __dt__8dCcD_SphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate/__dt__8dCcD_SphFv.s" } @@ -1073,7 +874,8 @@ asm dCcD_Sph::~dCcD_Sph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Sph::dCcD_Sph() { +// asm dCcD_Sph::dCcD_Sph() { +extern "C" asm void __ct__8dCcD_SphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate/__ct__8dCcD_SphFv.s" } @@ -1083,7 +885,8 @@ asm dCcD_Sph::dCcD_Sph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { +// asm cM3dGSph::~cM3dGSph() { +extern "C" asm void __dt__8cM3dGSphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate/__dt__8cM3dGSphFv.s" } @@ -1093,14 +896,16 @@ asm cM3dGSph::~cM3dGSph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate/__dt__12dBgS_ObjAcchFv.s" } #pragma pop /* 80BD2E7C-80BD2E80 002B5C 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */ -cXyz::cXyz() { +// cXyz::cXyz() { +extern "C" asm void __ct__4cXyzFv() { /* empty function */ } diff --git a/rel/d/a/obj/d_a_obj_crvhahen/d_a_obj_crvhahen.cpp b/rel/d/a/obj/d_a_obj_crvhahen/d_a_obj_crvhahen.cpp index 7d2cee02655..bf058c81fbb 100644 --- a/rel/d/a/obj/d_a_obj_crvhahen/d_a_obj_crvhahen.cpp +++ b/rel/d/a/obj/d_a_obj_crvhahen/d_a_obj_crvhahen.cpp @@ -1,88 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_crvhahen -// +/** + * @file d_a_obj_crvhahen.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_crvhahen/d_a_obj_crvhahen.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz { - /* 80BD3F9C */ ~csXyz(); - /* 80BD3FD8 */ csXyz(); -}; - -struct cXyz { - /* 80BD36E4 */ ~cXyz(); - /* 80BD3FDC */ cXyz(); -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF0C */ void ZXYrotS(csXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObjCRVHAHEN_c { - /* 80BD342C */ void HahenSet(cXyz, cXyz, cXyz, cXyz, f32); - /* 80BD3628 */ void Wall_Check(cXyz, cXyz); - /* 80BD3720 */ void Hahen_Hakai(int, int); - /* 80BD38DC */ void CheckCull(); - /* 80BD3A9C */ void checkViewArea(cXyz*); - /* 80BD3B20 */ void Execute(); - /* 80BD3B74 */ void Delete(); - /* 80BD3C0C */ void setBaseMtx(); - /* 80BD3DBC */ void create(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); -}; - -struct J3DModel {}; - -struct dComIfG_play_c { - /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); - /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); - /* 8002CB68 */ void entrySimpleModel(J3DModel*, int); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct cBgS_LinChk {}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); -}; - -struct Vec {}; // // Forward References: @@ -108,7 +31,6 @@ extern "C" void __ct__5csXyzFv(); extern "C" void __ct__4cXyzFv(); extern "C" static bool daObjCRVHAHEN_IsDelete__FP15daObjCRVHAHEN_c(); extern "C" extern char const* const d_a_obj_crvhahen__stringBase0; -extern "C" extern void* g_profile_Obj_CRVHAHEN[12]; // // External References: @@ -139,9 +61,6 @@ extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP extern "C" void cM_rndF__Ff(); extern "C" void cM_rndFX__Ff(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECSquareDistance(); extern "C" void __construct_array(); extern "C" void _savegpr_21(); extern "C" void _savegpr_24(); @@ -153,13 +72,8 @@ extern "C" void _restgpr_24(); extern "C" void _restgpr_25(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; // // Declarations: @@ -258,7 +172,8 @@ asm void daObjCRVHAHEN_c::Wall_Check(cXyz param_0, cXyz param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_crvhahen/d_a_obj_crvhahen/__dt__4cXyzFv.s" } @@ -478,19 +393,22 @@ asm void daObjCRVHAHEN_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm csXyz::~csXyz() { +// asm csXyz::~csXyz() { +extern "C" asm void __dt__5csXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_crvhahen/d_a_obj_crvhahen/__dt__5csXyzFv.s" } #pragma pop /* 80BD3FD8-80BD3FDC 000D18 0004+00 1/1 0/0 0/0 .text __ct__5csXyzFv */ -csXyz::csXyz() { +// csXyz::csXyz() { +extern "C" asm void __ct__5csXyzFv() { /* empty function */ } /* 80BD3FDC-80BD3FE0 000D1C 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */ -cXyz::cXyz() { +// cXyz::cXyz() { +extern "C" asm void __ct__4cXyzFv() { /* empty function */ } @@ -502,25 +420,30 @@ static bool daObjCRVHAHEN_IsDelete(daObjCRVHAHEN_c* param_0) { /* ############################################################################################## */ /* 80BD4068-80BD4088 -00001 0020+00 1/0 0/0 0/0 .data l_daObjCRVHAHEN_Method */ -SECTION_DATA static void* l_daObjCRVHAHEN_Method[8] = { - (void*)daObjCRVHAHEN_Create__FP10fopAc_ac_c, - (void*)daObjCRVHAHEN_Delete__FP15daObjCRVHAHEN_c, - (void*)daObjCRVHAHEN_Execute__FP15daObjCRVHAHEN_c, - (void*)daObjCRVHAHEN_IsDelete__FP15daObjCRVHAHEN_c, - (void*)daObjCRVHAHEN_Draw__FP15daObjCRVHAHEN_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjCRVHAHEN_Method = { + (process_method_func)daObjCRVHAHEN_Create__FP10fopAc_ac_c, + (process_method_func)daObjCRVHAHEN_Delete__FP15daObjCRVHAHEN_c, + (process_method_func)daObjCRVHAHEN_Execute__FP15daObjCRVHAHEN_c, + (process_method_func)daObjCRVHAHEN_IsDelete__FP15daObjCRVHAHEN_c, + (process_method_func)daObjCRVHAHEN_Draw__FP15daObjCRVHAHEN_c, }; /* 80BD4088-80BD40B8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_CRVHAHEN */ -SECTION_DATA extern void* g_profile_Obj_CRVHAHEN[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00710000, (void*)&g_fpcLf_Method, - (void*)0x00000794, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01D40000, (void*)&l_daObjCRVHAHEN_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_CRVHAHEN = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_CRVHAHEN, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjCRVHAHEN_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 468, // mPriority + &l_daObjCRVHAHEN_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BD4048-80BD4048 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_crvlh_down/d_a_obj_crvlh_down.cpp b/rel/d/a/obj/d_a_obj_crvlh_down/d_a_obj_crvlh_down.cpp index 301239ecdb5..4f85b1a93cb 100644 --- a/rel/d/a/obj/d_a_obj_crvlh_down/d_a_obj_crvlh_down.cpp +++ b/rel/d/a/obj/d_a_obj_crvlh_down/d_a_obj_crvlh_down.cpp @@ -1,127 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_crvlh_down -// +/** + * @file d_a_obj_crvlh_down.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_crvlh_down/d_a_obj_crvlh_down.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static f32 mGroundY; -}; - -struct daObjCRVLH_UP_c { - /* 80BD4F1C */ void HakaiSet(); -}; - -struct daObjCRVLH_DW_c { - /* 80BD4138 */ void initCcCylinder(); - /* 80BD41A4 */ void SetCcSyl(); - /* 80BD4268 */ void BgRelease(); - /* 80BD42D8 */ void Break(); - /* 80BD45A4 */ void Obj_Hit(); - /* 80BD4644 */ void setBaseMtx(); - /* 80BD46EC */ void CreateHeap(); - /* 80BD4764 */ void create(); - /* 80BD4A84 */ void Create(); - /* 80BD4AC8 */ void Execute(f32 (**)[3][4]); - /* 80BD4C44 */ void Draw(); - /* 80BD4CC8 */ void Delete(); -}; - -struct daObjCRVHAHEN_c { - /* 80BD342C */ void HahenSet(cXyz, cXyz, cXyz, cXyz, f32); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C6B8 */ void getObjectResName2Index(char const*, char const*); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dBgW_Base {}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct J3DModel {}; // // Forward References: @@ -200,11 +85,8 @@ extern "C" void SetC__8cM3dGCylFRC4cXyz(); extern "C" void SetR__8cM3dGCylFf(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -212,8 +94,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void HahenSet__15daObjCRVHAHEN_cF4cXyz4cXyz4cXyz4cXyzf(); @@ -441,25 +321,30 @@ SECTION_DEAD static char const* const stringBase_80BD4DB1 = "U_CrvLH_Down.dzb"; #pragma pop /* 80BD4DC8-80BD4DE8 -00001 0020+00 1/0 0/0 0/0 .data l_daObjCRVLH_DW_Method */ -SECTION_DATA static void* l_daObjCRVLH_DW_Method[8] = { - (void*)daObjCRVLH_DW_Create__FP10fopAc_ac_c, - (void*)daObjCRVLH_DW_Delete__FP15daObjCRVLH_DW_c, - (void*)daObjCRVLH_DW_Execute__FP15daObjCRVLH_DW_c, - (void*)daObjCRVLH_DW_IsDelete__FP15daObjCRVLH_DW_c, - (void*)daObjCRVLH_DW_Draw__FP15daObjCRVLH_DW_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjCRVLH_DW_Method = { + (process_method_func)daObjCRVLH_DW_Create__FP10fopAc_ac_c, + (process_method_func)daObjCRVLH_DW_Delete__FP15daObjCRVLH_DW_c, + (process_method_func)daObjCRVLH_DW_Execute__FP15daObjCRVLH_DW_c, + (process_method_func)daObjCRVLH_DW_IsDelete__FP15daObjCRVLH_DW_c, + (process_method_func)daObjCRVLH_DW_Draw__FP15daObjCRVLH_DW_c, }; /* 80BD4DE8-80BD4E18 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_CRVLH_DW */ -SECTION_DATA extern void* g_profile_Obj_CRVLH_DW[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00740000, (void*)&g_fpcLf_Method, - (void*)0x0000074C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01D70000, (void*)&l_daObjCRVLH_DW_Method, - (void*)0x00040180, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_CRVLH_DW = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_CRVLH_DW, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjCRVLH_DW_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 471, // mPriority + &l_daObjCRVLH_DW_Method, // sub_method + 0x00040180, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BD4E18-80BD4E24 000054 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ diff --git a/rel/d/a/obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up.cpp b/rel/d/a/obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up.cpp index 198c6b5bf05..428a24685a2 100644 --- a/rel/d/a/obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up.cpp +++ b/rel/d/a/obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up.cpp @@ -1,135 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_crvlh_up -// +/** + * @file d_a_obj_crvlh_up.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - -struct cXyz { - /* 80BD56A4 */ ~cXyz(); - /* 80BD56E0 */ cXyz(); -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjCRVLH_UP_c { - /* 80BD4F1C */ void HakaiSet(); - /* 80BD4FB0 */ void UpMotion(); - /* 80BD4FD8 */ void Hakai(); - /* 80BD5254 */ void setBaseMtx(); - /* 80BD5378 */ void CreateHeap(); - /* 80BD53F0 */ void create(); - /* 80BD56EC */ void Create(); - /* 80BD5730 */ void Execute(f32 (**)[3][4]); - /* 80BD593C */ void Draw(); - /* 80BD59C0 */ void Delete(); -}; - -struct daObjCRVHAHEN_c { - /* 80BD342C */ void HahenSet(cXyz, cXyz, cXyz, cXyz, f32); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C6B8 */ void getObjectResName2Index(char const*, char const*); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); -}; - -struct dBgW_Base {}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cM3dGCyl { - /* 80BD5614 */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80BD565C */ ~cM3dGAab(); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -160,7 +36,6 @@ extern "C" extern char const* const d_a_obj_crvlh_up__stringBase0; // External References: // -extern "C" void OSReport(); extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void transM__14mDoMtx_stack_cFfff(); @@ -198,16 +73,11 @@ extern "C" void ChkUsed__9cBgW_BgIdCFv(); extern "C" void cLib_chaseAngleS__FPsss(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void __construct_array(); extern "C" void _savegpr_24(); extern "C" void _savegpr_29(); extern "C" void _restgpr_24(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -215,8 +85,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void HahenSet__15daObjCRVHAHEN_cF4cXyz4cXyz4cXyz4cXyzf(); @@ -458,25 +326,30 @@ SECTION_DEAD static char const* const stringBase_80BD5A8B = "U_CrvLH_Up.dzb"; #pragma pop /* 80BD5AA0-80BD5AC0 -00001 0020+00 1/0 0/0 0/0 .data l_daObjCRVLH_UP_Method */ -SECTION_DATA static void* l_daObjCRVLH_UP_Method[8] = { - (void*)daObjCRVLH_UP_Create__FP10fopAc_ac_c, - (void*)daObjCRVLH_UP_Delete__FP15daObjCRVLH_UP_c, - (void*)daObjCRVLH_UP_Execute__FP15daObjCRVLH_UP_c, - (void*)daObjCRVLH_UP_IsDelete__FP15daObjCRVLH_UP_c, - (void*)daObjCRVLH_UP_Draw__FP15daObjCRVLH_UP_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjCRVLH_UP_Method = { + (process_method_func)daObjCRVLH_UP_Create__FP10fopAc_ac_c, + (process_method_func)daObjCRVLH_UP_Delete__FP15daObjCRVLH_UP_c, + (process_method_func)daObjCRVLH_UP_Execute__FP15daObjCRVLH_UP_c, + (process_method_func)daObjCRVLH_UP_IsDelete__FP15daObjCRVLH_UP_c, + (process_method_func)daObjCRVLH_UP_Draw__FP15daObjCRVLH_UP_c, }; /* 80BD5AC0-80BD5AF0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_CRVLH_UP */ -SECTION_DATA extern void* g_profile_Obj_CRVLH_UP[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00730000, (void*)&g_fpcLf_Method, - (void*)0x00000770, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01D60000, (void*)&l_daObjCRVLH_UP_Method, - (void*)0x00040180, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_CRVLH_UP = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_CRVLH_UP, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjCRVLH_UP_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 470, // mPriority + &l_daObjCRVLH_UP_Method, // sub_method + 0x00040180, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BD5AF0-80BD5AFC 000054 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ @@ -521,7 +394,8 @@ asm void daObjCRVLH_UP_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up/__dt__8cM3dGCylFv.s" } @@ -531,7 +405,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up/__dt__8cM3dGAabFv.s" } @@ -541,14 +416,16 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up/__dt__4cXyzFv.s" } #pragma pop /* 80BD56E0-80BD56E4 000880 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */ -cXyz::cXyz() { +// cXyz::cXyz() { +extern "C" asm void __ct__4cXyzFv() { /* empty function */ } diff --git a/rel/d/a/obj/d_a_obj_crvsteel/d_a_obj_crvsteel.cpp b/rel/d/a/obj/d_a_obj_crvsteel/d_a_obj_crvsteel.cpp index 77be89d4ebc..78330b9164e 100644 --- a/rel/d/a/obj/d_a_obj_crvsteel/d_a_obj_crvsteel.cpp +++ b/rel/d/a/obj/d_a_obj_crvsteel/d_a_obj_crvsteel.cpp @@ -1,107 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_crvsteel -// +/** + * @file d_a_obj_crvsteel.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_crvsteel/d_a_obj_crvsteel.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static f32 mGroundY; -}; - -struct daObjCRVSTEEL_c { - /* 80BD5BFC */ void OpenSet(f32, f32); - /* 80BD5C18 */ void CloseSet(f32); - /* 80BD5C28 */ void CloseExecute(); - /* 80BD5CA0 */ void OpenExecute(); - /* 80BD5CC8 */ void Action(); - /* 80BD5D10 */ void setBaseMtx(); - /* 80BD5DB8 */ void CreateHeap(); - /* 80BD5E30 */ void create(); - /* 80BD60A8 */ void Create(); - /* 80BD60EC */ void Execute(f32 (**)[3][4]); - /* 80BD6138 */ void Draw(); - /* 80BD61BC */ void Delete(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C6B8 */ void getObjectResName2Index(char const*, char const*); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); -}; - -struct dBgW {}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80BD6030 */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); -}; - -struct J3DModel {}; // // Forward References: @@ -162,17 +66,12 @@ extern "C" void __ct__10dCcD_GSttsFv(); extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); extern "C" void _savegpr_28(); extern "C" void _restgpr_28(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" f32 mGroundY__11fopAcM_gc_c; // @@ -376,25 +275,30 @@ SECTION_DEAD static char const* const stringBase_80BD6258 = "U_CrvSteelGate.dzb" #pragma pop /* 80BD6270-80BD6290 -00001 0020+00 1/0 0/0 0/0 .data l_daObjCRVSTEEL_Method */ -SECTION_DATA static void* l_daObjCRVSTEEL_Method[8] = { - (void*)daObjCRVSTEEL_Create__FP10fopAc_ac_c, - (void*)daObjCRVSTEEL_Delete__FP15daObjCRVSTEEL_c, - (void*)daObjCRVSTEEL_Execute__FP15daObjCRVSTEEL_c, - (void*)daObjCRVSTEEL_IsDelete__FP15daObjCRVSTEEL_c, - (void*)daObjCRVSTEEL_Draw__FP15daObjCRVSTEEL_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjCRVSTEEL_Method = { + (process_method_func)daObjCRVSTEEL_Create__FP10fopAc_ac_c, + (process_method_func)daObjCRVSTEEL_Delete__FP15daObjCRVSTEEL_c, + (process_method_func)daObjCRVSTEEL_Execute__FP15daObjCRVSTEEL_c, + (process_method_func)daObjCRVSTEEL_IsDelete__FP15daObjCRVSTEEL_c, + (process_method_func)daObjCRVSTEEL_Draw__FP15daObjCRVSTEEL_c, }; /* 80BD6290-80BD62C0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_CRVSTEEL */ -SECTION_DATA extern void* g_profile_Obj_CRVSTEEL[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00720000, (void*)&g_fpcLf_Method, - (void*)0x00000848, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01D50000, (void*)&l_daObjCRVSTEEL_Method, - (void*)0x00040180, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_CRVSTEEL = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_CRVSTEEL, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjCRVSTEEL_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 469, // mPriority + &l_daObjCRVSTEEL_Method, // sub_method + 0x00040180, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BD62C0-80BD62E4 000054 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ @@ -438,7 +342,8 @@ asm void daObjCRVSTEEL_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_crvsteel/d_a_obj_crvsteel/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall.cpp b/rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall.cpp index 2af9384f78f..d38de0cbd4e 100644 --- a/rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall.cpp +++ b/rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall.cpp @@ -1,126 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_cwall -// +/** + * @file d_a_obj_cwall.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct fopAcM_lc_c { - /* 8001DC68 */ void lineCheck(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static f32 mGroundY; -}; - -struct daPy_py_c { - /* 8015F478 */ void setFmChainPos(fopAc_ac_c*, cXyz*, int); - /* 8015F520 */ void setPlayerSe(u32); - /* 80BD9F74 */ void getRightHandPos() const; -}; - -struct daObjCwall_c { - struct chain_s { - /* 80BD6E94 */ ~chain_s(); - /* 80BD6ED0 */ chain_s(); - }; - - /* 80BD6A4C */ void initBaseMtx(); - /* 80BD6A88 */ void setBaseMtx(); - /* 80BD6AEC */ void Create(); - /* 80BD6D08 */ void CreateHeap(); - /* 80BD6ED4 */ void create1st(); - /* 80BD6F80 */ void Execute(f32 (**)[3][4]); - /* 80BD7288 */ void setTension(); - /* 80BD7718 */ void calcSePos(); - /* 80BD7788 */ void getChainBasePos(cXyz*); - /* 80BD7804 */ void setChainMtx(); - /* 80BD7AD4 */ void chain_control(); - /* 80BD7ED8 */ void chain_control2(); - /* 80BD84C0 */ void block_mode_proc_call(); - /* 80BD8594 */ void initWait(); - /* 80BD85C0 */ void modeWait(); - /* 80BD8748 */ void initWalk(); - /* 80BD8778 */ void modeWalk(); - /* 80BD8BC8 */ void initClose(); - /* 80BD8BF0 */ void modeClose(); - /* 80BD935C */ void setPower(f32, s16*); - /* 80BD9414 */ void checkWall(); - /* 80BD95A0 */ void checkPullNow(); - /* 80BD977C */ void checkPull(); - /* 80BD9848 */ void Draw(); - /* 80BD9948 */ void Delete(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -225,8 +111,6 @@ extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nwa__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void __construct_array(); extern "C" void __construct_new_array(); extern "C" void __ptmf_scall(); @@ -242,8 +126,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -253,9 +135,7 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" f32 Zero__4cXyz[3]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -1128,25 +1008,30 @@ asm void daObjCwall_c::Delete() { /* ############################################################################################## */ /* 80BDA240-80BDA260 -00001 0020+00 1/0 0/0 0/0 .data daObjCwall_METHODS */ -SECTION_DATA static void* daObjCwall_METHODS[8] = { - (void*)daObjCwall_create1st__FP12daObjCwall_c, - (void*)daObjCwall_MoveBGDelete__FP12daObjCwall_c, - (void*)daObjCwall_MoveBGExecute__FP12daObjCwall_c, - (void*)NULL, - (void*)daObjCwall_MoveBGDraw__FP12daObjCwall_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjCwall_METHODS = { + (process_method_func)daObjCwall_create1st__FP12daObjCwall_c, + (process_method_func)daObjCwall_MoveBGDelete__FP12daObjCwall_c, + (process_method_func)daObjCwall_MoveBGExecute__FP12daObjCwall_c, + 0, + (process_method_func)daObjCwall_MoveBGDraw__FP12daObjCwall_c, }; /* 80BDA260-80BDA290 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_ChainWall */ -SECTION_DATA extern void* g_profile_Obj_ChainWall[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x007F0000, (void*)&g_fpcLf_Method, - (void*)0x00000F5C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02560000, (void*)&daObjCwall_METHODS, - (void*)0x000C0000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_ChainWall = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_ChainWall, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjCwall_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 598, // mPriority + &daObjCwall_METHODS, // sub_method + 0x000C0000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BDA290-80BDA29C 0001D0 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -1383,7 +1268,8 @@ REGISTER_CTORS(0x80BD9EE4, __sinit_d_a_obj_cwall_cpp); #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::getRightHandPos() const { +// asm void daPy_py_c::getRightHandPos() const { +extern "C" asm void getRightHandPos__9daPy_py_cCFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall/getRightHandPos__9daPy_py_cCFv.s" } diff --git a/rel/d/a/obj/d_a_obj_damCps/d_a_obj_damCps.cpp b/rel/d/a/obj/d_a_obj_damCps/d_a_obj_damCps.cpp index 0aea87f3823..2c7491d0c2a 100644 --- a/rel/d/a/obj/d_a_obj_damCps/d_a_obj_damCps.cpp +++ b/rel/d/a/obj/d_a_obj_damCps/d_a_obj_damCps.cpp @@ -1,32 +1,26 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_damCps -// +/** + * @file d_a_obj_damCps.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_damCps/d_a_obj_damCps.h" #include "dol2asm.h" -// -// Forward References: -// - -extern "C" extern void* g_profile_Obj_DamCps[12]; - -// -// External References: -// - -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; - -// -// Declarations: -// - /* ############################################################################################## */ /* 80BDA460-80BDA490 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_DamCps */ -SECTION_DATA extern void* g_profile_Obj_DamCps[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, (void*)0x01750000, (void*)&g_fpcLf_Method, - (void*)0x00000568, (void*)NULL, (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02750000, (void*)NULL, (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_DamCps = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_DamCps, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(fopAc_ac_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 629, // mPriority + NULL, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.cpp b/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.cpp index a4f12a734f1..e11446bc964 100644 --- a/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.cpp +++ b/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.cpp @@ -1,211 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_dan -// +/** + * @file d_a_obj_dan.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DAnmTransform {}; -struct J3DModelData {}; - -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; - -struct mDoExt_McaMorfSO { - /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, - int, Z2Creature*, u32, u32); - /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32); - /* 800110B0 */ void play(u32, s8); - /* 800111C0 */ void entryDL(); - /* 800111EC */ void modelCalc(); - /* 80011310 */ void stopZelAnime(); -}; - -struct fopAc_ac_c {}; - -struct daPy_boomerangMove_c { - /* 8015E5B0 */ void initOffset(cXyz const*); - /* 8015E654 */ void posMove(cXyz*, s16*, fopAc_ac_c*, s16); - /* 8015E87C */ void bgCheckAfterOffset(cXyz const*); -}; - -struct daObj_DanHIO_c { - /* 80BDA58C */ daObj_DanHIO_c(); - /* 80BDC2F0 */ ~daObj_DanHIO_c(); -}; - -struct daObjDAN_c { - /* 80BDA5B4 */ void InitCcSph(); - /* 80BDA620 */ void SetCcSph(); - /* 80BDA698 */ void CreateHeap(); - /* 80BDAA3C */ void SpeedSet(); - /* 80BDAA9C */ void LinkChk(); - /* 80BDAB14 */ void MoveAction(); - /* 80BDAC10 */ void DamageAction(); - /* 80BDAFDC */ void Action(); - /* 80BDB074 */ void checkGroundPos(); - /* 80BDB0D8 */ void Insect_Release(); - /* 80BDB0E8 */ void Z_BufferChk(); - /* 80BDB264 */ void ParticleSet(); - /* 80BDB388 */ void ObjHit(); - /* 80BDB4E0 */ void BoomChk(); - /* 80BDB62C */ void Execute(); - /* 80BDB928 */ void Delete(); - /* 80BDB990 */ void setBaseMtx(); - /* 80BDBB0C */ void CreateChk(); - /* 80BDBCB8 */ void create(); -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dMenu_Insect_c { - /* 801D9F3C */ void isCatchNotGiveInsect(u8); -}; - -struct dInsect_c { - /* 8015E010 */ dInsect_c(); - /* 8015E078 */ void Insect_GetDemoMain(); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dDlst_peekZ_c { - /* 80056018 */ void newData(s16, s16, u32*); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjGndChk { - /* 80BDC170 */ ~dBgS_ObjGndChk(); -}; - -struct dBgS_ObjAcch { - /* 80BDC1E8 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); -}; - -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); - /* 800773A4 */ void ClrMoveBGOnly(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_PolyInfo {}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; - -struct cBgS { - /* 800744A0 */ void GroundCross(cBgS_GndChk*); -}; - -struct _GXTexObj {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80BDA9B0 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -329,15 +131,12 @@ extern "C" void init__10Z2CreatureFP3VecP3VecUcUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); extern "C" void _savegpr_25(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_25(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -347,7 +146,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" void __register_global_object(); // @@ -360,25 +158,30 @@ SECTION_RODATA static f32 const lit_3775 = 1.0f; COMPILER_STRIP_GATE(0x80BDC3B0, &lit_3775); /* 80BDC47C-80BDC49C -00001 0020+00 1/0 0/0 0/0 .data l_daObjDAN_Method */ -SECTION_DATA static void* l_daObjDAN_Method[8] = { - (void*)daObjDAN_Create__FP10fopAc_ac_c, - (void*)daObjDAN_Delete__FP10daObjDAN_c, - (void*)daObjDAN_Execute__FP10daObjDAN_c, - (void*)daObjDAN_IsDelete__FP10daObjDAN_c, - (void*)daObjDAN_Draw__FP10daObjDAN_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjDAN_Method = { + (process_method_func)daObjDAN_Create__FP10fopAc_ac_c, + (process_method_func)daObjDAN_Delete__FP10daObjDAN_c, + (process_method_func)daObjDAN_Execute__FP10daObjDAN_c, + (process_method_func)daObjDAN_IsDelete__FP10daObjDAN_c, + (process_method_func)daObjDAN_Draw__FP10daObjDAN_c, }; /* 80BDC49C-80BDC4CC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Dan */ -SECTION_DATA extern void* g_profile_Obj_Dan[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01440000, (void*)&g_fpcLf_Method, - (void*)0x00000A6C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01E10000, (void*)&l_daObjDAN_Method, - (void*)0x000C0120, (void*)0x030E0000, +extern actor_process_profile_definition g_profile_Obj_Dan = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Dan, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjDAN_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 481, // mPriority + &l_daObjDAN_Method, // sub_method + 0x000C0120, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BDC4CC-80BDC4FC 000050 0030+00 2/2 0/0 0/0 .data __vt__14dBgS_ObjGndChk */ @@ -525,7 +328,8 @@ asm void daObjDAN_c::CreateHeap() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__dt__12J3DFrameCtrlFv.s" } @@ -934,7 +738,8 @@ asm void daObjDAN_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +// asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +extern "C" asm void __dt__14dBgS_ObjGndChkFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__dt__14dBgS_ObjGndChkFv.s" } @@ -944,7 +749,8 @@ asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_dmelevator/d_a_obj_dmelevator.cpp b/rel/d/a/obj/d_a_obj_dmelevator/d_a_obj_dmelevator.cpp index db5448e8f2c..c03e6982b32 100644 --- a/rel/d/a/obj/d_a_obj_dmelevator/d_a_obj_dmelevator.cpp +++ b/rel/d/a/obj/d_a_obj_dmelevator/d_a_obj_dmelevator.cpp @@ -7,84 +7,6 @@ #include "d/d_procname.h" #include "dol2asm.h" -class daObjDmElevator_c : public dBgS_MoveBgActor { -public: - /* 80BDDD38 */ void initBaseMtx(); - /* 80BDDD90 */ void setBaseMtx(); - /* 80BDDEFC */ int Create(); - /* 80BDE0A4 */ int init(); - /* 80BDE2F8 */ int CreateHeap(); - /* 80BDE448 */ int create1st(); - /* 80BDE500 */ int Execute(Mtx**); - /* 80BDE5F8 */ void setting_ride_flag(); - /* 80BDE6FC */ void event_sw_proc_call(); - /* 80BDE7A0 */ void actionSwPauseNoneInit(); - /* 80BDE7AC */ void actionSwPauseNone(); - /* 80BDE7B0 */ void actionSwPauseOrderInit(); - /* 80BDE808 */ void actionSwPauseOrder(); - /* 80BDE83C */ void actionSwPauseInit(); - /* 80BDE868 */ void actionSwPause(); - /* 80BDE8D0 */ void calc_top_pos(); - /* 80BDE960 */ void mode_sw_proc_call(); - /* 80BDEA1C */ void modeSwWaitLowerInit(); - /* 80BDEA44 */ void modeSwWaitLower(); - /* 80BDEB88 */ void modeSwLowerInit(); - /* 80BDEC10 */ void modeSwLower(); - /* 80BDEC94 */ void modeSwWaitUpperInit(); - /* 80BDECB4 */ void modeSwWaitUpper(); - /* 80BDECE0 */ void modeSwUpperInit(); - /* 80BDED64 */ void modeSwUpper(); - /* 80BDEDE0 */ void event_proc_call(); - /* 80BDEECC */ void actionWait(); - /* 80BDEF60 */ void actionOrderEvent(); - /* 80BDF000 */ void actionEvent(); - /* 80BDF068 */ void actionStartEvent(); - /* 80BDF0A0 */ void actionMoveStart(); - /* 80BDF168 */ void actionDead(); - /* 80BDF16C */ int demoProc(); - /* 80BDF320 */ void moveInit(); - /* 80BDF3B8 */ int moveProc(); - /* 80BDF618 */ int Draw(); - /* 80BDF6DC */ int Delete(); - - u32 getPathID() { return fopAcM_GetParamBit(this, 8, 8); } - - /* 0x5A0 */ request_of_phase_process_class mPhaseReq; - /* 0x5A8 */ request_of_phase_process_class mPhaseReq2; - /* 0x5B0 */ J3DModel* mpElevatorModel; - /* 0x5B4 */ J3DModel* mpSwitchModel; - /* 0x5B8 */ Z2SoundObjSimple mSoundObj; - /* 0x5D8 */ u8 field_0x5D8[0x5DC - 0x5D8]; - /* 0x5DC */ s32 field_0x5dc; - /* 0x5E0 */ u8 field_0x5e0; - /* 0x5E1 */ u8 field_0x5e1; - /* 0x5E2 */ u8 field_0x5e2; - /* 0x5E3 */ u8 field_0x5e3; - /* 0x5E4 */ s16 field_0x5e4; - /* 0x5E6 */ s16 field_0x5e6; - /* 0x5E8 */ dBgW* mpBgW; - /* 0x5EC */ Mtx mMtx; - /* 0x61C */ cXyz mXyz; - /* 0x628 */ u8 field_0x628; - /* 0x629 */ u8 field_0x629; - /* 0x62A */ u8 field_0x62a; - /* 0x62B */ u8 field_0x62b; - /* 0x62C */ u8 field_0x62C[0x62D - 0x62C]; - /* 0x62D */ u8 field_0x62d; - /* 0x62E */ u8 field_0x62e; - /* 0x62F */ u8 field_0x62f; - /* 0x630 */ u8 field_0x630; - /* 0x631 */ u8 field_0x631; - /* 0x632 */ u8 field_0x632; - /* 0x633 */ u8 field_0x633; - /* 0x634 */ u8 field_0x634; - /* 0x635 */ u8 field_0x635; - /* 0x636 */ u8 field_0x636; - /* 0x637 */ u8 field_0x637; - /* 0x638 */ f32 field_0x638; - /* 0x63C */ f32 field_0x63c; - /* 0x640 */ f32 field_0x640; -}; // Size: 0x644 // // Forward References: @@ -1173,25 +1095,30 @@ asm int daObjDmElevator_c::Delete() { /* ############################################################################################## */ /* 80BDFAB8-80BDFAD8 -00001 0020+00 1/0 0/0 0/0 .data daObjDmElevator_METHODS */ -SECTION_DATA static void* daObjDmElevator_METHODS[8] = { - (void*)daObjDmElevator_create1st__FP17daObjDmElevator_c, - (void*)daObjDmElevator_MoveBGDelete__FP17daObjDmElevator_c, - (void*)daObjDmElevator_MoveBGExecute__FP17daObjDmElevator_c, - (void*)NULL, - (void*)daObjDmElevator_MoveBGDraw__FP17daObjDmElevator_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjDmElevator_METHODS = { + (process_method_func)daObjDmElevator_create1st__FP17daObjDmElevator_c, + (process_method_func)daObjDmElevator_MoveBGDelete__FP17daObjDmElevator_c, + (process_method_func)daObjDmElevator_MoveBGExecute__FP17daObjDmElevator_c, + 0, + (process_method_func)daObjDmElevator_MoveBGDraw__FP17daObjDmElevator_c, }; /* 80BDFAD8-80BDFB08 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Elevator */ -SECTION_DATA extern void* g_profile_Obj_Elevator[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00920000, (void*)&g_fpcLf_Method, - (void*)0x00000644, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x021E0000, (void*)&daObjDmElevator_METHODS, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Elevator = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Elevator, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjDmElevator_c),// mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 542, // mPriority + &daObjDmElevator_METHODS, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BDFB08-80BDFB30 0001C4 0028+00 1/1 0/0 0/0 .data __vt__17daObjDmElevator_c */ diff --git a/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.cpp b/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.cpp index 9c4f07a4bb3..350cd3a8159 100644 --- a/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.cpp +++ b/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.cpp @@ -1,172 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_drop -// +/** + * @file d_a_obj_drop.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" +#include "d/d_camera.h" -// -// Types: -// - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct _GXColor {}; - -struct mDoGph_gInf_c { - /* 80008028 */ void fadeOut_f(f32, _GXColor&); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObjDrop_c { - /* 80BDFD8C */ void Create(); - /* 80BDFE58 */ void create(); - /* 80BE0358 */ void dropGet(); - /* 80BE0430 */ void checkGetArea(); - /* 80BE05DC */ void checkCompleteDemo(); - /* 80BE0658 */ void createLineEffect(); - /* 80BE071C */ void removeLineEffect(); - /* 80BE077C */ void createBodyEffect(); - /* 80BE0840 */ void removeBodyEffect(); - /* 80BE08A0 */ void modeInit(); - /* 80BE0994 */ void modeNoParent(); - /* 80BE09F4 */ void modeParentWait(); - /* 80BE0C08 */ void modeWait(); - /* 80BE1928 */ bool actionCompleteWait(); - /* 80BE1930 */ void actionOrderCompleteDemo(); - /* 80BE19D0 */ void actionCompleateDemo(); - /* 80BE1ACC */ void actionWaitCompleteGetDemo(); - /* 80BE1B5C */ void actionCompleteGetDemo(); - /* 80BE1BC4 */ void execute(); - /* 80BE1DCC */ void _delete(); -}; - -struct dTres_c { - /* 8009C3CC */ void setPosition(int, u8, Vec const*, int); -}; - -struct dSv_memBit_c { - /* 800347A0 */ void onTbox(int); - /* 800347E8 */ void isTbox(int) const; - /* 80034810 */ void onSwitch(int); -}; - -struct dSv_light_drop_c { - /* 80034320 */ void setLightDropNum(u8, u8); - /* 80034340 */ void getLightDropNum(u8) const; - /* 8003439C */ void isLightDropGetFlag(u8) const; -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 8003498C */ void onEventBit(u16); -}; - -struct dPa_levelEcallBack { - /* 80BE02AC */ void cleanup(); - /* 80BE1E6C */ ~dPa_levelEcallBack(); -}; - -struct dPa_followEcallBack { - /* 80049580 */ dPa_followEcallBack(u8, u8); - /* 80BE0228 */ ~dPa_followEcallBack(); - /* 80BE02B0 */ void __defctor(); -}; - -struct dKy_tevstr_c {}; - -struct csXyz { - /* 80BE02D8 */ ~csXyz(); - /* 80BE0314 */ csXyz(); - - static u8 Zero[4]; -}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dEvent_manager_c { - /* 80047ADC */ void endCheckOld(char const*); -}; - -struct dCamera_c { - /* 80163028 */ void SetTrimTypeForce(s32); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80BE0148 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80BE01B8 */ ~dBgS_AcchCir(); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDFF8 */ void deleteObject(); -}; - -struct JPABaseEmitter {}; - -struct JPAEmitterCallBack { - /* 8027E6A4 */ ~JPAEmitterCallBack(); - /* 80BE1EE0 */ void execute(JPABaseEmitter*); - /* 80BE1EE4 */ void executeAfter(JPABaseEmitter*); - /* 80BE1EE8 */ void draw(JPABaseEmitter*); - /* 80BE1EEC */ void drawAfter(JPABaseEmitter*); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; // // Forward References: @@ -279,7 +120,6 @@ extern "C" void __dt__18JPAEmitterCallBackFv(); extern "C" void deleteObject__14Z2SoundObjBaseFv(); extern "C" void __ct__16Z2SoundObjSimpleFv(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); extern "C" void __construct_array(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_18(); @@ -290,8 +130,6 @@ extern "C" void _restgpr_18(); extern "C" void _restgpr_24(); extern "C" void _restgpr_25(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" extern void* __vt__19dPa_followEcallBack[10]; extern "C" extern void* __vt__8dCcD_Sph[36]; @@ -493,25 +331,28 @@ SECTION_DATA static u8 l_completeDemoFunc[60] = { #pragma pop /* 80BE2158-80BE2178 -00001 0020+00 1/0 0/0 0/0 .data l_daObjDrop_Method */ -SECTION_DATA static void* l_daObjDrop_Method[8] = { - (void*)daObjDrop_Create__FP10fopAc_ac_c, - (void*)daObjDrop_Delete__FP11daObjDrop_c, - (void*)daObjDrop_Execute__FP11daObjDrop_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjDrop_Method = { + (process_method_func)daObjDrop_Create__FP10fopAc_ac_c, + (process_method_func)daObjDrop_Delete__FP11daObjDrop_c, + (process_method_func)daObjDrop_Execute__FP11daObjDrop_c, }; /* 80BE2178-80BE21A8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Drop */ -SECTION_DATA extern void* g_profile_Obj_Drop[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x021F0000, (void*)&g_fpcLf_Method, - (void*)0x00000A7C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00F30000, (void*)&l_daObjDrop_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Drop = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Drop, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjDrop_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 243, // mPriority + &l_daObjDrop_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BE21A8-80BE21B4 000148 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGLin */ @@ -629,7 +470,8 @@ extern "C" asm void __dt__10dCcD_GSttsFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop/__dt__12dBgS_ObjAcchFv.s" } @@ -639,7 +481,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop/__dt__12dBgS_AcchCirFv.s" } @@ -649,14 +492,16 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dPa_followEcallBack::~dPa_followEcallBack() { +// asm dPa_followEcallBack::~dPa_followEcallBack() { +extern "C" asm void __dt__19dPa_followEcallBackFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop/__dt__19dPa_followEcallBackFv.s" } #pragma pop /* 80BE02AC-80BE02B0 00064C 0004+00 1/0 0/0 0/0 .text cleanup__18dPa_levelEcallBackFv */ -void dPa_levelEcallBack::cleanup() { +// void dPa_levelEcallBack::cleanup() { +extern "C" asm void cleanup__18dPa_levelEcallBackFv() { /* empty function */ } @@ -665,7 +510,8 @@ void dPa_levelEcallBack::cleanup() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dPa_followEcallBack::__defctor() { +// asm void dPa_followEcallBack::__defctor() { +extern "C" asm void __defctor__19dPa_followEcallBackFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop/__defctor__19dPa_followEcallBackFv.s" } @@ -675,14 +521,16 @@ asm void dPa_followEcallBack::__defctor() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm csXyz::~csXyz() { +// asm csXyz::~csXyz() { +extern "C" asm void __dt__5csXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop/__dt__5csXyzFv.s" } #pragma pop /* 80BE0314-80BE0318 0006B4 0004+00 1/1 0/0 0/0 .text __ct__5csXyzFv */ -csXyz::csXyz() { +// csXyz::csXyz() { +extern "C" asm void __ct__5csXyzFv() { /* empty function */ } @@ -1125,7 +973,8 @@ static asm void daObjDrop_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dPa_levelEcallBack::~dPa_levelEcallBack() { +// asm dPa_levelEcallBack::~dPa_levelEcallBack() { +extern "C" asm void __dt__18dPa_levelEcallBackFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop/__dt__18dPa_levelEcallBackFv.s" } @@ -1133,25 +982,29 @@ asm dPa_levelEcallBack::~dPa_levelEcallBack() { /* 80BE1EE0-80BE1EE4 002280 0004+00 1/0 0/0 0/0 .text * execute__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::execute(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::execute(JPABaseEmitter* param_0) { +extern "C" asm void execute__18JPAEmitterCallBackFP14JPABaseEmitter() { /* empty function */ } /* 80BE1EE4-80BE1EE8 002284 0004+00 1/0 0/0 0/0 .text * executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::executeAfter(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::executeAfter(JPABaseEmitter* param_0) { +extern "C" asm void executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter() { /* empty function */ } /* 80BE1EE8-80BE1EEC 002288 0004+00 1/0 0/0 0/0 .text draw__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::draw(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::draw(JPABaseEmitter* param_0) { +extern "C" asm void draw__18JPAEmitterCallBackFP14JPABaseEmitter() { /* empty function */ } /* 80BE1EEC-80BE1EF0 00228C 0004+00 1/0 0/0 0/0 .text * drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::drawAfter(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::drawAfter(JPABaseEmitter* param_0) { +extern "C" asm void drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter() { /* empty function */ } diff --git a/rel/d/a/obj/d_a_obj_dust/d_a_obj_dust.cpp b/rel/d/a/obj/d_a_obj_dust/d_a_obj_dust.cpp index b7a9507555b..c40d194db7b 100644 --- a/rel/d/a/obj/d_a_obj_dust/d_a_obj_dust.cpp +++ b/rel/d/a/obj/d_a_obj_dust/d_a_obj_dust.cpp @@ -1,133 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_dust -// +/** + * @file d_a_obj_dust.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_dust/d_a_obj_dust.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct fopAcM_wt_c { - /* 8001DD84 */ void waterCheck(cXyz const*); - - static f32 mWaterY[1 + 1 /* padding */]; -}; - -struct daObjDust_c { - /* 80BE22B8 */ void Search_Ymb(); - /* 80BE2490 */ void RideOn_Angle(s16&, f32, s16, f32); - /* 80BE24F8 */ void Check_RideOn(); - /* 80BE2708 */ void initBaseMtx(); - /* 80BE2734 */ void setBaseMtx(); - /* 80BE2A70 */ void CreateHeap(); - /* 80BE2AE8 */ void Create(); - /* 80BE2B30 */ void Execute(f32 (**)[3][4]); - /* 80BE2E9C */ void Draw(); - /* 80BE2F40 */ void Delete(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C6B8 */ void getObjectResName2Index(char const*, char const*); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); -}; - -struct dBgW {}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80BE2A00 */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); -}; - -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - template - struct TSinCosTable {}; - /* TSinCosTable<13, f32> */ - struct TSinCosTable__template0 { - /* 80BE2F74 */ void func_80BE2F74(void* _this, s16) /* const */; - }; - - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -198,20 +76,14 @@ extern "C" void cLib_chaseF__FPfff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -513,25 +385,30 @@ SECTION_DEAD static char const* const stringBase_80BE3027 = "M_FloatingDust01.dz SECTION_DATA static void* l_arcName = (void*)&d_a_obj_dust__stringBase0; /* 80BE3058-80BE3078 -00001 0020+00 1/0 0/0 0/0 .data l_daObjDust_Method */ -SECTION_DATA static void* l_daObjDust_Method[8] = { - (void*)daObjDust_Create__FP10fopAc_ac_c, - (void*)daObjDust_Delete__FP11daObjDust_c, - (void*)daObjDust_Execute__FP11daObjDust_c, - (void*)daObjDust_IsDelete__FP11daObjDust_c, - (void*)daObjDust_Draw__FP11daObjDust_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjDust_Method = { + (process_method_func)daObjDust_Create__FP10fopAc_ac_c, + (process_method_func)daObjDust_Delete__FP11daObjDust_c, + (process_method_func)daObjDust_Execute__FP11daObjDust_c, + (process_method_func)daObjDust_IsDelete__FP11daObjDust_c, + (process_method_func)daObjDust_Draw__FP11daObjDust_c, }; /* 80BE3078-80BE30A8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_DUST */ -SECTION_DATA extern void* g_profile_Obj_DUST[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00760000, (void*)&g_fpcLf_Method, - (void*)0x0000084C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01D90000, (void*)&l_daObjDust_Method, - (void*)0x00040180, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_DUST = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_DUST, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjDust_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 473, // mPriority + &l_daObjDust_Method, // sub_method + 0x00040180, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BE30A8-80BE30CC 000054 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ @@ -575,7 +452,8 @@ static asm void daObjDust_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_dust/d_a_obj_dust/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp b/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp index a740d02be5a..d74f84af77c 100644 --- a/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp +++ b/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp @@ -7,10 +7,6 @@ #include "d/com/d_com_inf_game.h" #include "d/d_procname.h" -struct daObj { - template - static int PrmAbstract(const fopAc_ac_c* param_0, T param_1, T param_2); -}; /* 8057C9D8-8057CA94 000078 00BC+00 1/1 0/0 0/0 .text _create__Q28daObjEff5Act_cFv */ int daObjEff::Act_c::_create() { diff --git a/rel/d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj.cpp b/rel/d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj.cpp index 9b3dcff2c1c..732722635ef 100644 --- a/rel/d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj.cpp +++ b/rel/d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj.cpp @@ -7,52 +7,6 @@ #include "d/d_procname.h" #include "dol2asm.h" -// -// Types: -// - -class daObjFallObj_c : public dBgS_MoveBgActor { -public: - /* 80BE39B8 */ void initBaseMtx(); - /* 80BE3A24 */ void setBaseMtx(); - /* 80BE3A88 */ int Create(); - /* 80BE3BA8 */ void getFallTime(); - /* 80BE3BD4 */ void getFallHeight(); - /* 80BE3C28 */ int CreateHeap(); - /* 80BE3C98 */ int create1st(); - /* 80BE3D24 */ int Execute(Mtx**); - /* 80BE4138 */ void action(); - /* 80BE4228 */ void action_wait(bool); - /* 80BE42C0 */ void action_fallStart(); - /* 80BE43E4 */ void action_countdown(); - /* 80BE45F4 */ void action_fall(); - /* 80BE466C */ void action_end(); - /* 80BE4670 */ void action_follow_fall(); - /* 80BE4700 */ void checkHang(); - /* 80BE47A0 */ void checkHang2(); - /* 80BE48A4 */ int Draw(); - /* 80BE4948 */ int Delete(); - - u32 getTime() { return fopAcM_GetParamBit(this, 8, 8); } - u32 getPos() { return fopAcM_GetParamBit(this, 0x14, 8); } - BOOL checkFallStart() { return fopAcM_SearchByID(parentActorID)->speed.y != 0.0f; } - - /* 0x5A0 */ request_of_phase_process_class mPhaseReq; - /* 0x5A8 */ Mtx mMtx; - /* 0x5D8 */ u8 field_0x5d8; - /* 0x5D9 */ u8 field_0x5d9; - /* 0x5DA */ s16 field_0x5da; - /* 0x5DC */ s16 field_0x5dc; - /* 0x5DE */ s16 field_0x5de; - /* 0x5E0 */ s32 field_0x5e0; - /* 0x5E4 */ u8 field_0x5e4; - /* 0x5E5 */ u8 field_0x5e5; - /* 0x5E8 */ J3DModel* mpModel; - /* 0x5EC */ s32 field_0x5ec; - /* 0x5F0 */ u8 field_0x5f0; - /* 0x5F1 */ u8 field_0x5f1; - /* 0x5F4 */ Z2SoundObjSimple mSoundObj; -}; // Size: 0x614 // // Forward References: @@ -481,25 +435,30 @@ asm int daObjFallObj_c::Delete() { /* ############################################################################################## */ /* 80BE4B3C-80BE4B5C -00001 0020+00 1/0 0/0 0/0 .data daObjFallObj_METHODS */ -SECTION_DATA static void* daObjFallObj_METHODS[8] = { - (void*)daObjFallObj_create1st__FP14daObjFallObj_c, - (void*)daObjFallObj_MoveBGDelete__FP14daObjFallObj_c, - (void*)daObjFallObj_MoveBGExecute__FP14daObjFallObj_c, - (void*)NULL, - (void*)daObjFallObj_MoveBGDraw__FP14daObjFallObj_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjFallObj_METHODS = { + (process_method_func)daObjFallObj_create1st__FP14daObjFallObj_c, + (process_method_func)daObjFallObj_MoveBGDelete__FP14daObjFallObj_c, + (process_method_func)daObjFallObj_MoveBGExecute__FP14daObjFallObj_c, + 0, + (process_method_func)daObjFallObj_MoveBGDraw__FP14daObjFallObj_c, }; /* 80BE4B5C-80BE4B8C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_FallObj */ -SECTION_DATA extern void* g_profile_Obj_FallObj[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00AA0000, (void*)&g_fpcLf_Method, - (void*)0x00000614, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02280000, (void*)&daObjFallObj_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_FallObj = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_FallObj, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjFallObj_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 552, // mPriority + &daObjFallObj_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BE4B8C-80BE4BB4 00006C 0028+00 1/1 0/0 0/0 .data __vt__14daObjFallObj_c */ diff --git a/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.cpp b/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.cpp index 24f4acdbdbd..924b9304b55 100644 --- a/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.cpp +++ b/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.cpp @@ -1,102 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_fchain -// +/** + * @file d_a_obj_fchain.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz { - /* 80BE6328 */ ~csXyz(); - /* 80BE6364 */ csXyz(); -}; - -struct Vec {}; - -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266B84 */ void operator*(f32) const; - /* 80266F48 */ void normalizeZP(); - /* 80267128 */ void atan2sX_Z() const; - /* 80267150 */ void atan2sY_XZ() const; - /* 80BE6368 */ ~cXyz(); - /* 80BE63A4 */ cXyz(); - - static f32 Zero[3]; -}; -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CDD4 */ void transM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjFchain_shape_c { - /* 80BE7194 */ void draw(); - /* 80BE73D4 */ ~daObjFchain_shape_c(); -}; - -struct daObjFchain_c { - /* 80BE5FF8 */ void createHeap(); - /* 80BE6074 */ void create(); - /* 80BE63C8 */ ~daObjFchain_c(); - /* 80BE64E0 */ void checkPlayerFoot(cXyz const*, cXyz const*, cXyz*); - /* 80BE66B4 */ void setGroundVec(cXyz*, f32); - /* 80BE6868 */ void execute(); - /* 80BE7324 */ void draw(); -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dEvent_manager_c { - /* 800483E8 */ void getRunEventName(); -}; - -struct J3DShape { - /* 80315300 */ void loadPreDrawSetting() const; - - static u8 sOldVcdVatCmd[4]; -}; - -struct J3DPacket; -struct J3DDrawBuffer { - /* 8032548C */ void entryImm(J3DPacket*, u16); -}; - -struct J3DPacket { - /* 80312750 */ bool entry(J3DDrawBuffer*); -}; // // Forward References: @@ -156,32 +66,17 @@ extern "C" void __dl__FPv(); extern "C" bool entry__9J3DPacketFP13J3DDrawBuffer(); extern "C" void loadPreDrawSetting__8J3DShapeCFv(); extern "C" void entryImm__13J3DDrawBufferFP9J3DPacketUs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECScale(); -extern "C" void PSVECSquareMag(); -extern "C" void GXLoadLightObjImm(); -extern "C" void GXSetChanAmbColor(); -extern "C" void GXSetChanMatColor(); -extern "C" void GXLoadPosMtxImm(); -extern "C" void GXLoadNrmMtxImm(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void _savegpr_23(); extern "C" void _savegpr_24(); extern "C" void _restgpr_23(); extern "C" void _restgpr_24(); -extern "C" void strcmp(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__9J3DPacket[5]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" f32 Zero__4cXyz[3]; -extern "C" extern u8 j3dSys[284]; extern "C" extern u32 g_whiteColor; -extern "C" extern u32 __float_nan; extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 sOldVcdVatCmd__8J3DShape[4]; @@ -307,25 +202,30 @@ COMPILER_STRIP_GATE(0x80BE7470, &lit_3720); #pragma pop /* 80BE74D8-80BE74F8 -00001 0020+00 1/0 0/0 0/0 .data l_daObjFchain_Method */ -SECTION_DATA static void* l_daObjFchain_Method[8] = { - (void*)daObjFchain_Create__FP10fopAc_ac_c, - (void*)daObjFchain_Delete__FP13daObjFchain_c, - (void*)daObjFchain_Execute__FP13daObjFchain_c, - (void*)NULL, - (void*)daObjFchain_Draw__FP13daObjFchain_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjFchain_Method = { + (process_method_func)daObjFchain_Create__FP10fopAc_ac_c, + (process_method_func)daObjFchain_Delete__FP13daObjFchain_c, + (process_method_func)daObjFchain_Execute__FP13daObjFchain_c, + 0, + (process_method_func)daObjFchain_Draw__FP13daObjFchain_c, }; /* 80BE74F8-80BE7528 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Fchain */ -SECTION_DATA extern void* g_profile_Obj_Fchain[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01580000, (void*)&g_fpcLf_Method, - (void*)0x00000928, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00F60000, (void*)&l_daObjFchain_Method, - (void*)0x00060000, (void*)0x030E0000, +extern actor_process_profile_definition g_profile_Obj_Fchain = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Fchain, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjFchain_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 246, // mPriority + &l_daObjFchain_Method, // sub_method + 0x00060000, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BE7528-80BE753C 000050 0014+00 3/3 0/0 0/0 .data __vt__19daObjFchain_shape_c */ @@ -351,14 +251,16 @@ asm void daObjFchain_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm csXyz::~csXyz() { +// asm csXyz::~csXyz() { +extern "C" asm void __dt__5csXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain/__dt__5csXyzFv.s" } #pragma pop /* 80BE6364-80BE6368 0003E4 0004+00 1/1 0/0 0/0 .text __ct__5csXyzFv */ -csXyz::csXyz() { +// csXyz::csXyz() { +extern "C" asm void __ct__5csXyzFv() { /* empty function */ } @@ -366,14 +268,16 @@ csXyz::csXyz() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain/__dt__4cXyzFv.s" } #pragma pop /* 80BE63A4-80BE63A8 000424 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */ -cXyz::cXyz() { +// cXyz::cXyz() { +extern "C" asm void __ct__4cXyzFv() { /* empty function */ } diff --git a/rel/d/a/obj/d_a_obj_fireWood/d_a_obj_fireWood.cpp b/rel/d/a/obj/d_a_obj_fireWood/d_a_obj_fireWood.cpp index 673eb0dffae..b07a3ec4203 100644 --- a/rel/d/a/obj/d_a_obj_fireWood/d_a_obj_fireWood.cpp +++ b/rel/d/a/obj/d_a_obj_fireWood/d_a_obj_fireWood.cpp @@ -6,49 +6,6 @@ #include "rel/d/a/obj/d_a_obj_fireWood/d_a_obj_fireWood.h" #include "dol2asm.h" -class daFireWood_c : public fopAc_ac_c { -public: - /* 80BE76B0 */ void setBaseMtx(); - /* 80BE7708 */ void create(); - /* 80BE79A0 */ void lightInit(); - /* 80BE7A14 */ void setLight(); - /* 80BE7A38 */ void Execute(); - /* 80BE7E74 */ bool Draw(); - /* 80BE7E7C */ void Delete(); - - /* 0x568 */ u8 field_0x568[0x574 - 0x568]; - /* 0x574 */ dCcD_Stts mStts; - /* 0x5B0 */ dCcD_Cyl mCyl; - /* 0x6EC */ cXyz field_0x6ec; - /* 0x6F8 */ u8 field_0x6f8; - /* 0x6F9 */ u8 field_0x6f9; - /* 0x6FC */ u32 field_0x6fc[4]; - /* 0x70C */ u8 field_0x70c; - /* 0x710 */ cXyz field_0x710; - /* 0x71C */ LIGHT_INFLUENCE mLightInfluence; - /* 0x73C */ u8 field_0x73c; - - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; -}; // Size: 0x740 - -#ifdef NONMATCHING -class daFireWood_HIO_c : public mDoHIO_entry_c { -public: - /* 80BE762C */ daFireWood_HIO_c(); - /* 80BE7F24 */ virtual ~daFireWood_HIO_c(); - - /* 0x4 */ f32 field_0x4; - /* 0x8 */ f32 field_0x8; - /* 0xC */ u8 field_0xc; -}; -#else -struct daFireWood_HIO_c { - /* 80BE762C */ daFireWood_HIO_c(); - /* 80BE7F24 */ ~daFireWood_HIO_c(); -}; -#endif - // // Forward References: // @@ -145,25 +102,30 @@ static Vec l_cull_box[2] = { }; /* 80BE80AC-80BE80CC -00001 0020+00 1/0 0/0 0/0 .data l_daFireWood_Method */ -SECTION_DATA static void* l_daFireWood_Method[8] = { - (void*)daFireWood_Create__FP10fopAc_ac_c, - (void*)daFireWood_Delete__FP12daFireWood_c, - (void*)daFireWood_Execute__FP12daFireWood_c, - (void*)NULL, - (void*)daFireWood_Draw__FP12daFireWood_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daFireWood_Method = { + (process_method_func)daFireWood_Create__FP10fopAc_ac_c, + (process_method_func)daFireWood_Delete__FP12daFireWood_c, + (process_method_func)daFireWood_Execute__FP12daFireWood_c, + 0, + (process_method_func)daFireWood_Draw__FP12daFireWood_c, }; /* 80BE80CC-80BE80FC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_FireWood */ -SECTION_DATA extern void* g_profile_Obj_FireWood[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01690000, (void*)&g_fpcLf_Method, - (void*)0x00000740, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01FA0000, (void*)&l_daFireWood_Method, - (void*)0x00060000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_FireWood = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_FireWood, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daFireWood_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 506, // mPriority + &l_daFireWood_Method, // sub_method + 0x00060000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BE80FC-80BE8108 0000AC 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ diff --git a/rel/d/a/obj/d_a_obj_fireWood2/d_a_obj_fireWood2.cpp b/rel/d/a/obj/d_a_obj_fireWood2/d_a_obj_fireWood2.cpp index 1746cbff394..bb82cd22703 100644 --- a/rel/d/a/obj/d_a_obj_fireWood2/d_a_obj_fireWood2.cpp +++ b/rel/d/a/obj/d_a_obj_fireWood2/d_a_obj_fireWood2.cpp @@ -7,47 +7,6 @@ #include "dol2asm.h" #include "m_Do/m_Do_hostIO.h" -// -// Types: -// - -class daFireWood2_c : public fopAc_ac_c { -public: - /* 80BE82D0 */ void setBaseMtx(); - /* 80BE8328 */ void create(); - /* 80BE8640 */ void lightInit(); - /* 80BE86CC */ void setLight(); - /* 80BE86FC */ void cutLight(); - /* 80BE872C */ void pointLightProc(); - /* 80BE87DC */ void Execute(); - /* 80BE8D98 */ int Draw(); - /* 80BE8DA0 */ void Delete(); - - /* 0x568 */ u8 field_0x568[0x574 - 0x568]; - /* 0x574 */ dCcD_Stts mStts; - /* 0x5B0 */ dCcD_Cyl mCyl; - /* 0x6EC */ cXyz field_0x6ec; - /* 0x6F8 */ u8 field_0x6f8; - /* 0x6F9 */ u8 field_0x6f9; - /* 0x6FA */ u8 field_0x6fa; - /* 0x6FB */ u8 field_0x6fb; - /* 0x6FC */ u32 field_0x6fc; - /* 0x700 */ u32 field_0x700; - /* 0x704 */ u32 field_0x704; - /* 0x708 */ u32 field_0x708; - /* 0x70C */ cXyz field_0x70c; - /* 0x718 */ u8 field_0x718; - /* 0x71C */ f32 field_0x71c; - /* 0x720 */ LIGHT_INFLUENCE mLightInfluence; - - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; -}; // Size: 0x740 - -struct daFireWood2_HIO_c { - /* 80BE824C */ daFireWood2_HIO_c(); - /* 80BE8E54 */ ~daFireWood2_HIO_c(); -}; // // Forward References: @@ -153,25 +112,30 @@ SECTION_DATA static u8 l_cull_box[24] = { }; /* 80BE8FF4-80BE9014 -00001 0020+00 1/0 0/0 0/0 .data l_daFireWood2_Method */ -SECTION_DATA static void* l_daFireWood2_Method[8] = { - (void*)daFireWood2_Create__FP10fopAc_ac_c, - (void*)daFireWood2_Delete__FP13daFireWood2_c, - (void*)daFireWood2_Execute__FP13daFireWood2_c, - (void*)NULL, - (void*)daFireWood2_Draw__FP13daFireWood2_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daFireWood2_Method = { + (process_method_func)daFireWood2_Create__FP10fopAc_ac_c, + (process_method_func)daFireWood2_Delete__FP13daFireWood2_c, + (process_method_func)daFireWood2_Execute__FP13daFireWood2_c, + 0, + (process_method_func)daFireWood2_Draw__FP13daFireWood2_c, }; /* 80BE9014-80BE9044 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_FireWood2 */ -SECTION_DATA extern void* g_profile_Obj_FireWood2[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00390000, (void*)&g_fpcLf_Method, - (void*)0x00000740, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01EE0000, (void*)&l_daFireWood2_Method, - (void*)0x00060000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_FireWood2 = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv1Cdl00, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daFireWood2_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 494, // mPriority + &l_daFireWood2_Method, // sub_method + 0x00060000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BE9044-80BE9050 0000AC 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ diff --git a/rel/d/a/obj/d_a_obj_firepillar/d_a_obj_firepillar.cpp b/rel/d/a/obj/d_a_obj_firepillar/d_a_obj_firepillar.cpp index 795c65518aa..a499c056f30 100644 --- a/rel/d/a/obj/d_a_obj_firepillar/d_a_obj_firepillar.cpp +++ b/rel/d/a/obj/d_a_obj_firepillar/d_a_obj_firepillar.cpp @@ -1,76 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_firepillar -// +/** + * @file d_a_obj_firepillar.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_firepillar/d_a_obj_firepillar.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObjFPillar_c { - /* 80BE9118 */ void initBaseMtx(); - /* 80BE9138 */ void setBaseMtx(); - /* 80BE9190 */ void Create(); - /* 80BE9230 */ void create(); - /* 80BE94E4 */ void execute(); - /* 80BE9610 */ void action(); - /* 80BE96B4 */ void actionOffInit(); - /* 80BE96E0 */ void actionOff(); - /* 80BE9784 */ void actionOnWaitInit(); - /* 80BE97B8 */ void actionOnWait(); - /* 80BE986C */ void actionOnInit(); - /* 80BE98A0 */ void actionOn(); - /* 80BE9984 */ void draw(); - /* 80BE99B8 */ bool _delete(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80BE9474 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80BE9404 */ ~dBgS_AcchCir(); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); -}; - -struct csXyz {}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; // // Forward References: @@ -128,13 +64,9 @@ extern "C" void __ct__8cM3dGCpsFv(); extern "C" void Set__8cM3dGCpsFRC9cM3dGCpsS(); extern "C" void cLib_chaseF__FPfff(); extern "C" void __dl__FPv(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cps[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CpsAttr[25]; @@ -258,25 +190,30 @@ SECTION_DATA static u8 l_func[36] = { #pragma pop /* 80BE9B88-80BE9BA8 -00001 0020+00 1/0 0/0 0/0 .data l_daObjFPillar_Method */ -SECTION_DATA static void* l_daObjFPillar_Method[8] = { - (void*)daObjFPillar_Create__FP10fopAc_ac_c, - (void*)daObjFPillar_Delete__FP14daObjFPillar_c, - (void*)daObjFPillar_Execute__FP14daObjFPillar_c, - (void*)NULL, - (void*)daObjFPillar_Draw__FP14daObjFPillar_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjFPillar_Method = { + (process_method_func)daObjFPillar_Create__FP10fopAc_ac_c, + (process_method_func)daObjFPillar_Delete__FP14daObjFPillar_c, + (process_method_func)daObjFPillar_Execute__FP14daObjFPillar_c, + 0, + (process_method_func)daObjFPillar_Draw__FP14daObjFPillar_c, }; /* 80BE9BA8-80BE9BD8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_FirePillar */ -SECTION_DATA extern void* g_profile_Obj_FirePillar[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x015D0000, (void*)&g_fpcLf_Method, - (void*)0x00000974, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01BE0000, (void*)&l_daObjFPillar_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_FirePillar = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_FirePillar, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjFPillar_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 446, // mPriority + &l_daObjFPillar_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BE9BD8-80BE9BE4 00011C 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ @@ -356,7 +293,8 @@ extern "C" asm void __dt__10dCcD_GSttsFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_firepillar/d_a_obj_firepillar/__dt__12dBgS_AcchCirFv.s" } @@ -366,7 +304,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_firepillar/d_a_obj_firepillar/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2.cpp b/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2.cpp index 0bd91faaf60..856f8373e24 100644 --- a/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2.cpp +++ b/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2.cpp @@ -1,142 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_firepillar2 -// +/** + * @file d_a_obj_firepillar2.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObjFPillar2_c { - /* 80BE9CD8 */ void initBaseMtx(); - /* 80BE9D5C */ void setBaseMtx(); - /* 80BE9DDC */ void Create(); - /* 80BEA034 */ void CreateHeap(); - /* 80BEA228 */ void create(); - /* 80BEA584 */ void execute(); - /* 80BEA734 */ void action(); - /* 80BEA808 */ void actionOffInit(); - /* 80BEA854 */ void actionOff(); - /* 80BEA98C */ void actionOnWaitInit(); - /* 80BEAAE4 */ void actionOnWait(); - /* 80BEAC68 */ void actionOnInit(); - /* 80BEADD0 */ void actionOn(); - /* 80BEB1B4 */ void draw(); - /* 80BEB278 */ void _delete(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80BEA514 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80BEA4A4 */ ~dBgS_AcchCir(); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDFF8 */ void deleteObject(); -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80BEA1E0 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -224,8 +95,6 @@ extern "C" void __ct__16Z2SoundObjSimpleFv(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_25(); extern "C" void _savegpr_27(); @@ -235,8 +104,6 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cps[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CpsAttr[25]; @@ -244,7 +111,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 BaseY__4cXyz[12]; extern "C" u8 BaseZ__4cXyz[12]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -502,25 +368,30 @@ SECTION_DATA static void* l_yogan_head_id[3] = { }; /* 80BEB62C-80BEB64C -00001 0020+00 1/0 0/0 0/0 .data l_daObjFPillar2_Method */ -SECTION_DATA static void* l_daObjFPillar2_Method[8] = { - (void*)daObjFPillar2_Create__FP10fopAc_ac_c, - (void*)daObjFPillar2_Delete__FP15daObjFPillar2_c, - (void*)daObjFPillar2_Execute__FP15daObjFPillar2_c, - (void*)NULL, - (void*)daObjFPillar2_Draw__FP15daObjFPillar2_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjFPillar2_Method = { + (process_method_func)daObjFPillar2_Create__FP10fopAc_ac_c, + (process_method_func)daObjFPillar2_Delete__FP15daObjFPillar2_c, + (process_method_func)daObjFPillar2_Execute__FP15daObjFPillar2_c, + 0, + (process_method_func)daObjFPillar2_Draw__FP15daObjFPillar2_c, }; /* 80BEB64C-80BEB67C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_FirePillar2 */ -SECTION_DATA extern void* g_profile_Obj_FirePillar2[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x015E0000, (void*)&g_fpcLf_Method, - (void*)0x000009EC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02110000, (void*)&l_daObjFPillar2_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_FirePillar2 = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_FirePillar2, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjFPillar2_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 529, // mPriority + &l_daObjFPillar2_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BEB67C-80BEB688 000154 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ @@ -585,7 +456,8 @@ asm void daObjFPillar2_c::CreateHeap() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2/__dt__12J3DFrameCtrlFv.s" } @@ -627,7 +499,8 @@ extern "C" asm void __dt__10dCcD_GSttsFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2/__dt__12dBgS_AcchCirFv.s" } @@ -637,7 +510,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_flag/d_a_obj_flag.cpp b/rel/d/a/obj/d_a_obj_flag/d_a_obj_flag.cpp index 12c3b2cb1eb..dadba03697c 100644 --- a/rel/d/a/obj/d_a_obj_flag/d_a_obj_flag.cpp +++ b/rel/d/a/obj/d_a_obj_flag/d_a_obj_flag.cpp @@ -1,95 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_flag -// +/** + * @file d_a_obj_flag.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_flag/d_a_obj_flag.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daSetBgObj_c { - /* 80031870 */ void getArcName(fopAc_ac_c*); -}; - -struct FlagJoint_c { - /* 80BEC3BC */ ~FlagJoint_c(); - /* 80BEC4E0 */ FlagJoint_c(); -}; - -struct csXyz { - /* 8026745C */ void operator+=(csXyz&); - /* 80267490 */ void operator-(csXyz&); - /* 802674E8 */ void operator*(f32); -}; - -struct daObjFlag_c { - /* 80BEB778 */ void create_init(); - /* 80BEB8F0 */ void initBaseMtx(); - /* 80BEB984 */ void getJointAngle(csXyz*, int); - /* 80BEB9AC */ void calcJointAngle(); - /* 80BEBC58 */ void calcAngleSwingZ(FlagJoint_c*, f32); - /* 80BEBDAC */ void calcAngleSwingX(FlagJoint_c*, f32); - /* 80BEBE64 */ void getSwingY(f32); - - static u8 const M_attr[52]; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DSys { - static u8 mCurrentMtx[48]; -}; -struct J3DModel {}; -struct J3DJoint {}; // // Forward References: @@ -113,7 +31,6 @@ extern "C" static void daObjFlag_Create__FP10fopAc_ac_c(); extern "C" void __ct__11FlagJoint_cFv(); extern "C" u8 const M_attr__11daObjFlag_c[52]; extern "C" extern char const* const d_a_obj_flag__stringBase0; -extern "C" extern void* g_profile_Obj_Flag[12]; // // External References: @@ -144,19 +61,14 @@ extern "C" void cLib_addCalcAngleS__FPsssss(); extern "C" void cLib_chaseS__FPsss(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void __cvt_fp2unsigned(); extern "C" void _savegpr_26(); extern "C" void _restgpr_26(); extern "C" void sprintf(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -425,25 +337,30 @@ FlagJoint_c::FlagJoint_c() { /* ############################################################################################## */ /* 80BEC580-80BEC5A0 -00001 0020+00 1/0 0/0 0/0 .data l_daObjFlag_Method */ -SECTION_DATA static void* l_daObjFlag_Method[8] = { - (void*)daObjFlag_Create__FP10fopAc_ac_c, - (void*)daObjFlag_Delete__FP11daObjFlag_c, - (void*)daObjFlag_Execute__FP11daObjFlag_c, - (void*)daObjFlag_IsDelete__FP11daObjFlag_c, - (void*)daObjFlag_Draw__FP11daObjFlag_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjFlag_Method = { + (process_method_func)daObjFlag_Create__FP10fopAc_ac_c, + (process_method_func)daObjFlag_Delete__FP11daObjFlag_c, + (process_method_func)daObjFlag_Execute__FP11daObjFlag_c, + (process_method_func)daObjFlag_IsDelete__FP11daObjFlag_c, + (process_method_func)daObjFlag_Draw__FP11daObjFlag_c, }; /* 80BEC5A0-80BEC5D0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Flag */ -SECTION_DATA extern void* g_profile_Obj_Flag[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x013B0000, (void*)&g_fpcLf_Method, - (void*)0x000005EC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x001A0000, (void*)&l_daObjFlag_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Flag = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Flag, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjFlag_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 26, // mPriority + &l_daObjFlag_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BEC554-80BEC554 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.cpp b/rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.cpp index fddd8f2e18e..bfd5eaf894d 100644 --- a/rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.cpp +++ b/rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.cpp @@ -1,106 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_flag2 -// +/** + * @file d_a_obj_flag2.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daSetBgObj_c { - /* 80031870 */ void getArcName(fopAc_ac_c*); -}; - -struct daObjFlag2_c { - /* 80BED22C */ void create_init(); - /* 80BED368 */ void initBaseMtx(); - /* 80BED3B8 */ void initCollision(); - /* 80BED44C */ void setCollision(); - /* 80BED480 */ void createHeap(); - /* 80BED6A0 */ void create(); - /* 80BED7A4 */ daObjFlag2_c(); - /* 80BEDCE0 */ void draw(); - /* 80BEDEE0 */ ~daObjFlag2_c(); - - static u8 const M_attr[20]; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct J3DSys { - /* 8031073C */ void reinitGX(); -}; - -struct J3DShape { - static u8 sOldVcdVatCmd[4]; -}; - -struct J3DPacket; -struct J3DDrawBuffer { - /* 8032548C */ void entryImm(J3DPacket*, u16); -}; - -struct J3DPacket { - /* 80312750 */ bool entry(J3DDrawBuffer*); -}; - -struct J3DModel {}; - -struct J3DLightObj { - /* 80BEDBBC */ J3DLightObj(); -}; - -struct J3DLightInfo { - /* 803256C4 */ void operator=(J3DLightInfo const&); -}; -struct FlagCloth_c { - /* 80BEC658 */ void initFlagPos(cXyz*, fopAc_ac_c*); - /* 80BEC7CC */ void calcFlagFactor(cXyz*, cXyz*, cXyz*, int); - /* 80BEC928 */ void calcFlagFactorSub(cXyz*, cXyz*, cXyz*, f32); - /* 80BECAE0 */ void calcFlagNormal(cXyz*, int); - /* 80BECC34 */ void calcFlagNormalBack(); - /* 80BECC78 */ void initCcSphere(fopAc_ac_c*); - /* 80BECCE4 */ void setCcSphere(); - /* 80BECD98 */ void execute(); - /* 80BECF30 */ void draw(); - /* 80BED9C4 */ ~FlagCloth_c(); - /* 80BEE0B8 */ void getTargetPos(); -}; // // Forward References: @@ -191,39 +98,6 @@ extern "C" void reinitGX__6J3DSysFv(); extern "C" bool entry__9J3DPacketFP13J3DDrawBuffer(); extern "C" void entryImm__13J3DDrawBufferFP9J3DPacketUs(); extern "C" void __as__12J3DLightInfoFRC12J3DLightInfo(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXConcat(); -extern "C" void GXSetVtxDesc(); -extern "C" void GXClearVtxDesc(); -extern "C" void GXSetVtxAttrFmt(); -extern "C" void GXSetArray(); -extern "C" void GXSetTexCoordGen2(); -extern "C" void GXSetNumTexGens(); -extern "C" void GXSetCullMode(); -extern "C" void GXSetNumChans(); -extern "C" void GXSetChanCtrl(); -extern "C" void GXInitTexObj(); -extern "C" void GXInitTexObjLOD(); -extern "C" void GXLoadTexObj(); -extern "C" void GXSetNumIndStages(); -extern "C" void GXSetTevColorIn(); -extern "C" void GXSetTevAlphaIn(); -extern "C" void GXSetTevColorOp(); -extern "C" void GXSetTevAlphaOp(); -extern "C" void GXSetTevColor(); -extern "C" void GXSetTevKColor(); -extern "C" void GXSetTevKColorSel(); -extern "C" void GXSetTevKAlphaSel(); -extern "C" void GXSetTevSwapMode(); -extern "C" void GXSetAlphaCompare(); -extern "C" void GXSetTevOrder(); -extern "C" void GXSetNumTevStages(); -extern "C" void GXSetZMode(); -extern "C" void GXSetZCompLoc(); -extern "C" void GXCallDisplayList(); -extern "C" void GXLoadPosMtxImm(); -extern "C" void GXLoadNrmMtxImm(); -extern "C" void GXSetClipMode(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void __cvt_fp2unsigned(); @@ -236,9 +110,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" void sprintf(); -extern "C" extern u8 const j3dDefaultLightInfo[52]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -249,9 +120,7 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" extern void* __vt__9J3DPacket[5]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" f32 Zero__4cXyz[3]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" u8 sOldVcdVatCmd__8J3DShape[4]; @@ -955,25 +824,30 @@ asm void daObjFlag2_c::create() { /* ############################################################################################## */ /* 80BEE95C-80BEE97C -00001 0020+00 1/0 0/0 0/0 .data l_daObjFlag2_Method */ -SECTION_DATA static void* l_daObjFlag2_Method[8] = { - (void*)daObjFlag2_Create__FP10fopAc_ac_c, - (void*)daObjFlag2_Delete__FP12daObjFlag2_c, - (void*)daObjFlag2_Execute__FP12daObjFlag2_c, - (void*)daObjFlag2_IsDelete__FP12daObjFlag2_c, - (void*)daObjFlag2_Draw__FP12daObjFlag2_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjFlag2_Method = { + (process_method_func)daObjFlag2_Create__FP10fopAc_ac_c, + (process_method_func)daObjFlag2_Delete__FP12daObjFlag2_c, + (process_method_func)daObjFlag2_Execute__FP12daObjFlag2_c, + (process_method_func)daObjFlag2_IsDelete__FP12daObjFlag2_c, + (process_method_func)daObjFlag2_Draw__FP12daObjFlag2_c, }; /* 80BEE97C-80BEE9AC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Flag2 */ -SECTION_DATA extern void* g_profile_Obj_Flag2[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x013C0000, (void*)&g_fpcLf_Method, - (void*)0x000010C0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x001B0000, (void*)&l_daObjFlag2_Method, - (void*)0x00044180, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Flag2 = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Flag2, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjFlag2_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 27, // mPriority + &l_daObjFlag2_Method, // sub_method + 0x00044180, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BEE9AC-80BEE9B8 00078C 000C+00 4/4 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -1061,7 +935,8 @@ extern "C" asm void __dt__8cM3dGSphFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DLightObj::J3DLightObj() { +// asm J3DLightObj::J3DLightObj() { +extern "C" asm void __ct__11J3DLightObjFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2/__ct__11J3DLightObjFv.s" } diff --git a/rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3.cpp b/rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3.cpp index 71d7b5776dd..dc52dd85b04 100644 --- a/rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3.cpp +++ b/rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3.cpp @@ -1,129 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_flag3 -// +/** + * @file d_a_obj_flag3.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266B84 */ void operator*(f32) const; - /* 80266CBC */ void outprod(Vec const&) const; - /* 80266DC4 */ void normZC() const; - /* 80266F48 */ void normalizeZP(); - /* 80BEEDA8 */ ~cXyz(); - /* 80BEFF30 */ cXyz(); - - static f32 Zero[3]; -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; -struct daSetBgObj_c { - /* 80031870 */ void getArcName(fopAc_ac_c*); -}; - -struct daObjFlag3_c { - /* 80BEEA78 */ void createHeap(); - /* 80BEED3C */ void execute(); - /* 80BEF700 */ ~daObjFlag3_c(); - /* 80BEF95C */ void create(); - /* 80BEFBC4 */ void create_init(); - - static u8 const M_attr[20]; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80BEFFC4 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct cM3dGSph { - /* 80BEFF34 */ ~cM3dGSph(); -}; - -struct cM3dGAab { - /* 80BEFF7C */ ~cM3dGAab(); -}; - -struct cCcD_GStts { - /* 80BF0058 */ ~cCcD_GStts(); -}; - -struct J3DSys { - /* 8031073C */ void reinitGX(); -}; - -struct J3DShape { - static u8 sOldVcdVatCmd[4]; -}; - -struct J3DPacket; -struct J3DDrawBuffer { - /* 8032548C */ void entryImm(J3DPacket*, u16); -}; - -struct J3DPacket { - /* 80312750 */ bool entry(J3DDrawBuffer*); -}; - -struct J3DModel {}; - -struct J3DLightObj { - /* 80BF0020 */ J3DLightObj(); -}; - -struct J3DLightInfo { - /* 803256C4 */ void operator=(J3DLightInfo const&); -}; - -struct FlagCloth2_c { - /* 80BEEDE4 */ void execute(); - /* 80BEEF74 */ void calcFlagNormal(cXyz*, int); - /* 80BEF278 */ void calcFlagFactor(cXyz*, cXyz*, cXyz*, int); - /* 80BEF790 */ ~FlagCloth2_c(); - /* 80BEFD08 */ void initFlagPos(cXyz*, fopAc_ac_c*); - /* 80BF00A0 */ void draw(); - /* 80BF0434 */ void getTargetPos(); -}; // // Forward References: @@ -193,44 +76,6 @@ extern "C" void reinitGX__6J3DSysFv(); extern "C" bool entry__9J3DPacketFP13J3DDrawBuffer(); extern "C" void entryImm__13J3DDrawBufferFP9J3DPacketUs(); extern "C" void __as__12J3DLightInfoFRC12J3DLightInfo(); -extern "C" void DCStoreRangeNoSync(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXConcat(); -extern "C" void PSVECAdd(); -extern "C" void PSVECScale(); -extern "C" void PSVECSquareMag(); -extern "C" void PSVECDotProduct(); -extern "C" void GXSetVtxDesc(); -extern "C" void GXClearVtxDesc(); -extern "C" void GXSetVtxAttrFmt(); -extern "C" void GXSetArray(); -extern "C" void GXSetTexCoordGen2(); -extern "C" void GXSetNumTexGens(); -extern "C" void GXBegin(); -extern "C" void GXSetCullMode(); -extern "C" void GXSetNumChans(); -extern "C" void GXSetChanCtrl(); -extern "C" void GXInitTexObj(); -extern "C" void GXInitTexObjLOD(); -extern "C" void GXLoadTexObj(); -extern "C" void GXSetNumIndStages(); -extern "C" void GXSetTevColorIn(); -extern "C" void GXSetTevAlphaIn(); -extern "C" void GXSetTevColorOp(); -extern "C" void GXSetTevAlphaOp(); -extern "C" void GXSetTevColor(); -extern "C" void GXSetTevKColor(); -extern "C" void GXSetTevKColorSel(); -extern "C" void GXSetTevKAlphaSel(); -extern "C" void GXSetTevSwapMode(); -extern "C" void GXSetAlphaCompare(); -extern "C" void GXSetTevOrder(); -extern "C" void GXSetNumTevStages(); -extern "C" void GXSetZMode(); -extern "C" void GXSetZCompLoc(); -extern "C" void GXLoadPosMtxImm(); -extern "C" void GXLoadNrmMtxImm(); -extern "C" void GXSetClipMode(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void _savegpr_24(); @@ -243,11 +88,7 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void abs(); extern "C" void sprintf(); -extern "C" extern u8 const j3dDefaultLightInfo[52]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; @@ -256,10 +97,7 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" extern void* __vt__9J3DPacket[5]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" f32 Zero__4cXyz[3]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; extern "C" u8 sOldVcdVatCmd__8J3DShape[4]; // @@ -390,7 +228,8 @@ asm void daObjFlag3_c::execute() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3/__dt__4cXyzFv.s" } @@ -511,25 +350,30 @@ asm daObjFlag3_c::~daObjFlag3_c() { /* ############################################################################################## */ /* 80BF058C-80BF05AC -00001 0020+00 1/0 0/0 0/0 .data l_daObjFlag3_Method */ -SECTION_DATA static void* l_daObjFlag3_Method[8] = { - (void*)daObjFlag3_Create__FP10fopAc_ac_c, - (void*)daObjFlag3_Delete__FP12daObjFlag3_c, - (void*)daObjFlag3_Execute__FP12daObjFlag3_c, - (void*)daObjFlag3_IsDelete__FP12daObjFlag3_c, - (void*)daObjFlag3_Draw__FP12daObjFlag3_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjFlag3_Method = { + (process_method_func)daObjFlag3_Create__FP10fopAc_ac_c, + (process_method_func)daObjFlag3_Delete__FP12daObjFlag3_c, + (process_method_func)daObjFlag3_Execute__FP12daObjFlag3_c, + (process_method_func)daObjFlag3_IsDelete__FP12daObjFlag3_c, + (process_method_func)daObjFlag3_Draw__FP12daObjFlag3_c, }; /* 80BF05AC-80BF05DC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Flag3 */ -SECTION_DATA extern void* g_profile_Obj_Flag3[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x013D0000, (void*)&g_fpcLf_Method, - (void*)0x00001340, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x001C0000, (void*)&l_daObjFlag3_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Flag3 = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Flag3, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjFlag3_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 28, // mPriority + &l_daObjFlag3_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BF05DC-80BF05E8 000050 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -692,7 +536,8 @@ asm void FlagCloth2_c::initFlagPos(cXyz* param_0, fopAc_ac_c* param_1) { #pragma pop /* 80BEFF30-80BEFF34 001530 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */ -cXyz::cXyz() { +// cXyz::cXyz() { +extern "C" asm void __ct__4cXyzFv() { /* empty function */ } @@ -700,7 +545,8 @@ cXyz::cXyz() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { +// asm cM3dGSph::~cM3dGSph() { +extern "C" asm void __dt__8cM3dGSphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3/__dt__8cM3dGSphFv.s" } @@ -710,7 +556,8 @@ asm cM3dGSph::~cM3dGSph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3/__dt__8cM3dGAabFv.s" } @@ -720,7 +567,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3/__dt__10dCcD_GSttsFv.s" } @@ -730,7 +578,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DLightObj::J3DLightObj() { +// asm J3DLightObj::J3DLightObj() { +extern "C" asm void __ct__11J3DLightObjFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3/__ct__11J3DLightObjFv.s" } @@ -740,7 +589,8 @@ asm J3DLightObj::J3DLightObj() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.cpp b/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.cpp index 66d2f0485c5..8ecbb9234f4 100644 --- a/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.cpp +++ b/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_fmobj -// +/** + * @file d_a_obj_fmobj.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.h" #include "d/bg/d_bg_w.h" diff --git a/rel/d/a/obj/d_a_obj_fw/d_a_obj_fw.cpp b/rel/d/a/obj/d_a_obj_fw/d_a_obj_fw.cpp index 4b6bae6b03e..759dfb09cc7 100644 --- a/rel/d/a/obj/d_a_obj_fw/d_a_obj_fw.cpp +++ b/rel/d/a/obj/d_a_obj_fw/d_a_obj_fw.cpp @@ -1,105 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_fw -// +/** + * @file d_a_obj_fw.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_fw/d_a_obj_fw.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_fw_class {}; - -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObj_Fw_HIO_c { - /* 80BF204C */ daObj_Fw_HIO_c(); - /* 80BF2AB0 */ ~daObj_Fw_HIO_c(); -}; -struct dSv_memBit_c { - /* 80034934 */ void isDungeonItem(int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS_ObjGndChk_Spl { - /* 800777B0 */ dBgS_ObjGndChk_Spl(); - /* 80077848 */ ~dBgS_ObjGndChk_Spl(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct csXyz {}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS_PolyInfo {}; - -struct Vec {}; - -struct cBgS_GndChk { - /* 80267D0C */ void SetPos(Vec const*); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); - /* 800744A0 */ void GroundCross(cBgS_GndChk*); -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDFF8 */ void deleteObject(); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -161,17 +68,10 @@ extern "C" void deleteObject__14Z2SoundObjBaseFv(); extern "C" void __ct__16Z2SoundObjSimpleFv(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" void __register_global_object(); @@ -195,25 +95,30 @@ SECTION_DATA static u8 dzbd[8] = { }; /* 80BF2BBC-80BF2BDC -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Fw_Method */ -SECTION_DATA static void* l_daObj_Fw_Method[8] = { - (void*)daObj_Fw_Create__FP10fopAc_ac_c, - (void*)daObj_Fw_Delete__FP12obj_fw_class, - (void*)daObj_Fw_Execute__FP12obj_fw_class, - (void*)daObj_Fw_IsDelete__FP12obj_fw_class, - (void*)daObj_Fw_Draw__FP12obj_fw_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObj_Fw_Method = { + (process_method_func)daObj_Fw_Create__FP10fopAc_ac_c, + (process_method_func)daObj_Fw_Delete__FP12obj_fw_class, + (process_method_func)daObj_Fw_Execute__FP12obj_fw_class, + (process_method_func)daObj_Fw_IsDelete__FP12obj_fw_class, + (process_method_func)daObj_Fw_Draw__FP12obj_fw_class, }; /* 80BF2BDC-80BF2C0C -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_FW */ -SECTION_DATA extern void* g_profile_OBJ_FW[12] = { - (void*)0xFFFFFFFD, (void*)0x0008FFFD, - (void*)0x02F00000, (void*)&g_fpcLf_Method, - (void*)0x00000628, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x002A0000, (void*)&l_daObj_Fw_Method, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_FW = { + fpcLy_CURRENT_e, // mLayerID + 8, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_FW, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(obj_fw_class), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 42, // mPriority + &l_daObj_Fw_Method, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BF2C0C-80BF2C18 000060 000C+00 2/2 0/0 0/0 .data __vt__14daObj_Fw_HIO_c */ diff --git a/rel/d/a/obj/d_a_obj_gadget/d_a_obj_gadget.cpp b/rel/d/a/obj/d_a_obj_gadget/d_a_obj_gadget.cpp index b9fb816058d..7f0b7c21625 100644 --- a/rel/d/a/obj/d_a_obj_gadget/d_a_obj_gadget.cpp +++ b/rel/d/a/obj/d_a_obj_gadget/d_a_obj_gadget.cpp @@ -1,155 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_gadget -// +/** + * @file d_a_obj_gadget.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_gadget/d_a_obj_gadget.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObj_Gadget_c { - /* 80BF2D2C */ ~daObj_Gadget_c(); - /* 80BF2F28 */ void create(); - /* 80BF3478 */ void CreateHeap(); - /* 80BF3504 */ void Delete(); - /* 80BF3538 */ void Execute(); - /* 80BF3FAC */ void Draw(); - /* 80BF4130 */ void createHeapCallBack(fopAc_ac_c*); - /* 80BF4150 */ void setEnvTevColor(); - /* 80BF41AC */ void setRoomNo(); - /* 80BF41F0 */ void reset(); - /* 80BF424C */ void setMtx(); - /* 80BF4354 */ void calcRollAngle(s16, int); - /* 80BF43F4 */ void getWallAngle(s16, s16*); - /* 80BF4584 */ void setSmokePrtcl(); - /* 80BF4600 */ void setWaterPrtcl(); - /* 80BF4728 */ void setHamonPrtcl(); -}; - -struct daObj_Gadget_Param_c { - /* 80BF48D8 */ ~daObj_Gadget_Param_c(); - - static u8 const m[44]; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B8B4 */ void forceOnEventMove(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct _GXTexObj {}; - -struct dDlst_shadowControl_c { - /* 80055F84 */ void setSimple(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*); - static u8 mSimpleTexObj[32]; -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80BF3408 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F40 */ void SetWallR(f32); - /* 80BF3300 */ ~dBgS_AcchCir(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct dBgS { - /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_LinChk {}; - -struct cBgS_GndChk { - /* 80267C1C */ cBgS_GndChk(); - /* 80267C94 */ ~cBgS_GndChk(); -}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -264,9 +122,6 @@ extern "C" void cLib_addCalcAngleS2__FPssss(); extern "C" void cLib_chaseF__FPfff(); extern "C" void cLib_chaseAngleS__FPsss(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void _savegpr_23(); extern "C" void _savegpr_25(); extern "C" void _savegpr_27(); @@ -275,8 +130,6 @@ extern "C" void _restgpr_23(); extern "C" void _restgpr_25(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -285,7 +138,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" void __register_global_object(); @@ -351,25 +203,30 @@ SECTION_DATA static u8 emttrId[8] = { }; /* 80BF4AB0-80BF4AD0 -00001 0020+00 1/0 0/0 0/0 .data daObj_Gadget_MethodTable */ -SECTION_DATA static void* daObj_Gadget_MethodTable[8] = { - (void*)daObj_Gadget_Create__FPv, - (void*)daObj_Gadget_Delete__FPv, - (void*)daObj_Gadget_Execute__FPv, - (void*)daObj_Gadget_IsDelete__FPv, - (void*)daObj_Gadget_Draw__FPv, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObj_Gadget_MethodTable = { + (process_method_func)daObj_Gadget_Create__FPv, + (process_method_func)daObj_Gadget_Delete__FPv, + (process_method_func)daObj_Gadget_Execute__FPv, + (process_method_func)daObj_Gadget_IsDelete__FPv, + (process_method_func)daObj_Gadget_Draw__FPv, }; /* 80BF4AD0-80BF4B00 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_GADGET */ -SECTION_DATA extern void* g_profile_OBJ_GADGET[12] = { - (void*)0xFFFFFFFD, (void*)0x0008FFFD, - (void*)0x02FA0000, (void*)&g_fpcLf_Method, - (void*)0x00000A4C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00520000, (void*)&daObj_Gadget_MethodTable, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_GADGET = { + fpcLy_CURRENT_e, // mLayerID + 8, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_GADGET, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObj_Gadget_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 82, // mPriority + &daObj_Gadget_MethodTable, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BF4B00-80BF4B0C 0000D4 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGPla */ @@ -550,7 +407,8 @@ extern "C" asm void __dt__8cM3dGAabFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gadget/d_a_obj_gadget/__dt__12dBgS_AcchCirFv.s" } @@ -582,7 +440,8 @@ extern "C" asm void __dt__4cXyzFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gadget/d_a_obj_gadget/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_ganonwall/d_a_obj_ganonwall.cpp b/rel/d/a/obj/d_a_obj_ganonwall/d_a_obj_ganonwall.cpp index ca84040da14..5b490892340 100644 --- a/rel/d/a/obj/d_a_obj_ganonwall/d_a_obj_ganonwall.cpp +++ b/rel/d/a/obj/d_a_obj_ganonwall/d_a_obj_ganonwall.cpp @@ -6,32 +6,6 @@ #include "rel/d/a/obj/d_a_obj_ganonwall/d_a_obj_ganonwall.h" #include "dol2asm.h" -// -// Types: -// - -class daObjGWall_c : public fopAc_ac_c { -public: - /* 80BF4D18 */ void initBaseMtx(); - /* 80BF4D54 */ void setBaseMtx(); - /* 80BF4DA8 */ int Create(); - /* 80BF4E8C */ int CreateHeap(); - /* 80BF4FF0 */ int create(); - /* 80BF50A4 */ int execute(); - /* 80BF50CC */ int checkDraw(); - /* 80BF5168 */ int draw(); - /* 80BF5530 */ int _delete(); - - u32 getEventBit1() { return fopAcM_GetParamBit(this, 0, 10); } - u32 getEventBit2() { return fopAcM_GetParamBit(this, 10, 10); } - - /* 0x568 */ request_of_phase_process_class mPhaseReq; - /* 0x570 */ J3DModel* mpModel; - /* 0x574 */ mDoExt_btkAnm* mpBtkAnm; - /* 0x578 */ u16 field_0x578; - /* 0x57A */ u16 field_0x57a; - /* 0x57C */ s16 field_0x57c; -}; // Size: 0x580 // // Forward References: @@ -172,25 +146,30 @@ SECTION_RODATA static f32 const lit_3711 = 1.0f; COMPILER_STRIP_GATE(0x80BF56B0, &lit_3711); /* 80BF56EC-80BF570C -00001 0020+00 1/0 0/0 0/0 .data l_daObjGWall_Method */ -SECTION_DATA static void* l_daObjGWall_Method[8] = { - (void*)daObjGWall_Create__FP12daObjGWall_c, - (void*)daObjGWall_Delete__FP12daObjGWall_c, - (void*)daObjGWall_Execute__FP12daObjGWall_c, - (void*)NULL, - (void*)daObjGWall_Draw__FP12daObjGWall_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjGWall_Method = { + (process_method_func)daObjGWall_Create__FP12daObjGWall_c, + (process_method_func)daObjGWall_Delete__FP12daObjGWall_c, + (process_method_func)daObjGWall_Execute__FP12daObjGWall_c, + 0, + (process_method_func)daObjGWall_Draw__FP12daObjGWall_c, }; /* 80BF570C-80BF573C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_GanonWall */ -SECTION_DATA extern void* g_profile_Obj_GanonWall[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01960000, (void*)&g_fpcLf_Method, - (void*)0x00000580, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x023A0000, (void*)&l_daObjGWall_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_GanonWall = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_GanonWall, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjGWall_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 570, // mPriority + &l_daObjGWall_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BF573C-80BF5748 000058 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ diff --git a/rel/d/a/obj/d_a_obj_ganonwall2/d_a_obj_ganonwall2.cpp b/rel/d/a/obj/d_a_obj_ganonwall2/d_a_obj_ganonwall2.cpp index f4f4e7cc69e..771a00ac7a3 100644 --- a/rel/d/a/obj/d_a_obj_ganonwall2/d_a_obj_ganonwall2.cpp +++ b/rel/d/a/obj/d_a_obj_ganonwall2/d_a_obj_ganonwall2.cpp @@ -1,115 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_ganonwall2 -// +/** + * @file d_a_obj_ganonwall2.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_ganonwall2/d_a_obj_ganonwall2.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c {}; - -struct daObjGWall2_c { - /* 80BF57D8 */ void initBaseMtx(); - /* 80BF5814 */ void setBaseMtx(); - /* 80BF5878 */ void Create(); - /* 80BF5950 */ void CreateHeap(); - /* 80BF5AB4 */ void create1st(); - /* 80BF5B74 */ void Execute(f32 (**)[3][4]); - /* 80BF5C0C */ void Draw(); - /* 80BF6004 */ void Delete(); -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JUTNameTab { - /* 802DEAF8 */ void getName(u16) const; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80BF5A6C */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -164,19 +60,13 @@ extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void getName__10JUTNameTabCFUs(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); extern "C" void _savegpr_27(); extern "C" void _savegpr_28(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); -extern "C" void strcmp(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // @@ -284,25 +174,30 @@ SECTION_RODATA static f32 const lit_3702 = 1.0f; COMPILER_STRIP_GATE(0x80BF61D8, &lit_3702); /* 80BF6214-80BF6234 -00001 0020+00 1/0 0/0 0/0 .data daObjGWall2_METHODS */ -SECTION_DATA static void* daObjGWall2_METHODS[8] = { - (void*)daObjGWall2_create1st__FP13daObjGWall2_c, - (void*)daObjGWall2_MoveBGDelete__FP13daObjGWall2_c, - (void*)daObjGWall2_MoveBGExecute__FP13daObjGWall2_c, - (void*)NULL, - (void*)daObjGWall2_MoveBGDraw__FP13daObjGWall2_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjGWall2_METHODS = { + (process_method_func)daObjGWall2_create1st__FP13daObjGWall2_c, + (process_method_func)daObjGWall2_MoveBGDelete__FP13daObjGWall2_c, + (process_method_func)daObjGWall2_MoveBGExecute__FP13daObjGWall2_c, + 0, + (process_method_func)daObjGWall2_MoveBGDraw__FP13daObjGWall2_c, }; /* 80BF6234-80BF6264 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_GanonWall2 */ -SECTION_DATA extern void* g_profile_Obj_GanonWall2[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00C00000, (void*)&g_fpcLf_Method, - (void*)0x000005C0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02440000, (void*)&daObjGWall2_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_GanonWall2 = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_GanonWall2, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjGWall2_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 580, // mPriority + &daObjGWall2_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BF6264-80BF6270 000058 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ @@ -326,7 +221,8 @@ asm void daObjGWall2_c::CreateHeap() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ganonwall2/d_a_obj_ganonwall2/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_gb/d_a_obj_gb.cpp b/rel/d/a/obj/d_a_obj_gb/d_a_obj_gb.cpp index 919aa46c542..02fe5f517ed 100644 --- a/rel/d/a/obj/d_a_obj_gb/d_a_obj_gb.cpp +++ b/rel/d/a/obj/d_a_obj_gb/d_a_obj_gb.cpp @@ -1,114 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_gb -// +/** + * @file d_a_obj_gb.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_gb/d_a_obj_gb.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_gb_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz { - /* 80BF678C */ ~cXyz(); - /* 80BF6DB0 */ cXyz(); -}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80BF6A98 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -162,9 +59,6 @@ extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSVECAdd(); extern "C" void __construct_array(); extern "C" void _savegpr_25(); extern "C" void _savegpr_26(); @@ -174,12 +68,8 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void strcmp(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -257,7 +147,8 @@ static asm void daObj_Gb_Execute(obj_gb_class* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gb/d_a_obj_gb/__dt__4cXyzFv.s" } @@ -339,25 +230,30 @@ SECTION_DATA static u8 dzb[8] = { #pragma pop /* 80BF6E3C-80BF6E5C -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Gb_Method */ -SECTION_DATA static void* l_daObj_Gb_Method[8] = { - (void*)daObj_Gb_Create__FP10fopAc_ac_c, - (void*)daObj_Gb_Delete__FP12obj_gb_class, - (void*)daObj_Gb_Execute__FP12obj_gb_class, - (void*)daObj_Gb_IsDelete__FP12obj_gb_class, - (void*)daObj_Gb_Draw__FP12obj_gb_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObj_Gb_Method = { + (process_method_func)daObj_Gb_Create__FP10fopAc_ac_c, + (process_method_func)daObj_Gb_Delete__FP12obj_gb_class, + (process_method_func)daObj_Gb_Execute__FP12obj_gb_class, + (process_method_func)daObj_Gb_IsDelete__FP12obj_gb_class, + (process_method_func)daObj_Gb_Draw__FP12obj_gb_class, }; /* 80BF6E5C-80BF6E8C -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_GB */ -SECTION_DATA extern void* g_profile_OBJ_GB[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x002D0000, (void*)&g_fpcLf_Method, - (void*)0x000006BC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00380000, (void*)&l_daObj_Gb_Method, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_GB = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_GB, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(obj_gb_class), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 56, // mPriority + &l_daObj_Gb_Method, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BF6E8C-80BF6E98 000090 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ @@ -381,7 +277,8 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gb/d_a_obj_gb/__dt__12J3DFrameCtrlFv.s" } @@ -436,7 +333,8 @@ static asm void daObj_Gb_Create(fopAc_ac_c* param_0) { #pragma pop /* 80BF6DB0-80BF6DB4 000B10 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */ -cXyz::cXyz() { +// cXyz::cXyz() { +extern "C" asm void __ct__4cXyzFv() { /* empty function */ } diff --git a/rel/d/a/obj/d_a_obj_geyser/d_a_obj_geyser.cpp b/rel/d/a/obj/d_a_obj_geyser/d_a_obj_geyser.cpp index fd7d7054b02..b343a6b8e9c 100644 --- a/rel/d/a/obj/d_a_obj_geyser/d_a_obj_geyser.cpp +++ b/rel/d/a/obj/d_a_obj_geyser/d_a_obj_geyser.cpp @@ -1,123 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_geyser -// +/** + * @file d_a_obj_geyser.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_geyser/d_a_obj_geyser.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CE38 */ void scaleM(f32, f32, f32); - /* 8000CF0C */ void ZXYrotS(csXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; -struct fopAc_ac_c {}; - -struct daObjGeyser_c { - /* 80BF6F18 */ void initBaseMtx(); - /* 80BF6F38 */ void setBaseMtx(); - /* 80BF6F80 */ void Create(); - /* 80BF70E0 */ void CreateHeap(); - /* 80BF7174 */ void create1st(); - /* 80BF7288 */ void Execute(f32 (**)[3][4]); - /* 80BF744C */ void action(); - /* 80BF75B8 */ void actionOff2Init(); - /* 80BF75C4 */ void actionOff2(); - /* 80BF7838 */ void actionOnWait2Init(); - /* 80BF787C */ void actionOnWait2(); - /* 80BF7C54 */ void actionOn2Init(); - /* 80BF7CA0 */ void actionOn2(); - /* 80BF8158 */ void actionDisappearInit(u8); - /* 80BF8178 */ void actionDisappear(); - /* 80BF823C */ void actionOffInit(); - /* 80BF8268 */ void actionOff(); - /* 80BF82D0 */ void actionOnWaitInit(); - /* 80BF8344 */ void actionOnWait(); - /* 80BF83E4 */ void actionOnInit(); - /* 80BF846C */ void actionOn(); - /* 80BF8584 */ void setPntWind(); - /* 80BF863C */ void cutPntWind(); - /* 80BF8660 */ void movePntWind(); - /* 80BF8870 */ void Draw(); - /* 80BF8914 */ void setEmitterPre00(); - /* 80BF89AC */ void setEmitterSrc00Sand(); - /* 80BF89B0 */ void setEmitterSrc01Smk(); - /* 80BF8A54 */ void stopEmitterPre00(); - /* 80BF8A80 */ void stopEmitterSrc00Sand(); - /* 80BF8AAC */ void stopEmitterSrc01Smk(); - /* 80BF8AD8 */ void setEmitterClm00(); - /* 80BF8B70 */ void setEmitterSmk01(); - /* 80BF8C08 */ void setEmitterSmk02(); - /* 80BF8CA0 */ void stopEmitterClm00(); - /* 80BF8CCC */ void stopEmitterSmk01(); - /* 80BF8CF8 */ void stopEmitterSmk02(); - /* 80BF8D24 */ void Delete(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dBgW { - /* 8007B9C0 */ void Move(); -}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct WIND_INFLUENCE {}; - -struct J3DModel {}; // // Forward References: @@ -221,13 +111,9 @@ extern "C" void cLib_chaseUC__FPUcUcUc(); extern "C" void cLib_chaseF__FPfff(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cps[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CpsAttr[25]; @@ -235,8 +121,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 struct_80BF9240[4]; @@ -570,25 +454,30 @@ SECTION_RODATA static f32 const lit_3861 = 1.0f / 10.0f; COMPILER_STRIP_GATE(0x80BF9040, &lit_3861); /* 80BF9198-80BF91B8 -00001 0020+00 1/0 0/0 0/0 .data daObjGeyser_METHODS */ -SECTION_DATA static void* daObjGeyser_METHODS[8] = { - (void*)daObjGeyser_create1st__FP13daObjGeyser_c, - (void*)daObjGeyser_MoveBGDelete__FP13daObjGeyser_c, - (void*)daObjGeyser_MoveBGExecute__FP13daObjGeyser_c, - (void*)NULL, - (void*)daObjGeyser_MoveBGDraw__FP13daObjGeyser_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjGeyser_METHODS = { + (process_method_func)daObjGeyser_create1st__FP13daObjGeyser_c, + (process_method_func)daObjGeyser_MoveBGDelete__FP13daObjGeyser_c, + (process_method_func)daObjGeyser_MoveBGExecute__FP13daObjGeyser_c, + 0, + (process_method_func)daObjGeyser_MoveBGDraw__FP13daObjGeyser_c, }; /* 80BF91B8-80BF91E8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Geyser */ -SECTION_DATA extern void* g_profile_Obj_Geyser[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01670000, (void*)&g_fpcLf_Method, - (void*)0x000007F0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02540000, (void*)&daObjGeyser_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Geyser = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Geyser, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjGeyser_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 596, // mPriority + &daObjGeyser_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BF91E8-80BF91F4 000180 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ diff --git a/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere.cpp b/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere.cpp index fef833b3966..42572ae1be1 100644 --- a/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere.cpp +++ b/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere.cpp @@ -1,250 +1,14 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_glowSphere -// +/** + * @file d_a_obj_glowSphere.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80BF93E8 */ ~mDoHIO_entry_c(); -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct fOpAcm_HIO_entry_c { - /* 80BF938C */ ~fOpAcm_HIO_entry_c(); -}; - -struct daGlwSph_c { - /* 80BF9430 */ void getSphMng(); - /* 80BF943C */ void setBaseMtx(); - /* 80BF94AC */ void createHeapCallBack(fopAc_ac_c*); - /* 80BF94CC */ void CreateHeap(); - /* 80BF95D4 */ void create(); - /* 80BF9B1C */ void execute(); - /* 80BF9BC0 */ void actionMain(); - /* 80BF9DF0 */ void effectSet(); - /* 80BF9F30 */ void getSE(); - /* 80BFA010 */ void getVibe(); - /* 80BFA064 */ void actionWaitInit(); - /* 80BFA070 */ void actionWait(); - /* 80BFA074 */ void actionGetInit(); - /* 80BFA130 */ void actionGet(); - /* 80BFA1E0 */ void actionMoveInit(); - /* 80BFA204 */ void actionMove(); - /* 80BFA2A4 */ void draw(); - /* 80BFA3EC */ void _delete(); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDSph[64]; - static u8 mSphMng[964]; -}; - -struct daGlwSph_HIO_c { - /* 80BF934C */ daGlwSph_HIO_c(); - /* 80BFA76C */ ~daGlwSph_HIO_c(); -}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266B84 */ void operator*(f32) const; - /* 80266F48 */ void normalizeZP(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; -struct _GXColor {}; -struct dPa_control_c { - struct level_c { - /* 8004B8B4 */ void forceOnEventMove(u32); - /* 8004B918 */ void getEmitter(u32); - }; - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); - - static u8 mParticleTracePCB[4 + 4 /* padding */]; -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcSph {}; - -struct dCcD_Sph { - /* 80084A34 */ void Set(dCcD_SrcSph const&); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); - /* 80BF9998 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 80084658 */ void ChkCoHit(); -}; - -struct dCcD_GAtTgCoCommonBase { - /* 80083688 */ void GetAc(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80BF9A64 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80BF99F4 */ ~dBgS_AcchCir(); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); -}; - -struct cM3dGSph { - /* 8026F648 */ void SetC(cXyz const&); - /* 8026F708 */ void SetR(f32); - /* 80BF9908 */ ~cM3dGSph(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 80BF9950 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80BFA724 */ ~cCcD_GStts(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct _GlSph_Mng_c { - /* 80BFA4B8 */ void _clrLstBuf(); - /* 80BFA4DC */ void entry(daGlwSph_c*); - /* 80BFA528 */ void remove(daGlwSph_c*); - /* 80BFA55C */ void _setting_main(); - /* 80BFA5C4 */ void _chkAllGet_main(); - /* 80BFA60C */ void SphSeProc(); - /* 80BFA6D8 */ void clrSphSe(); - /* 80BFA6E8 */ void getSphSe(); - /* 80BFA6F8 */ void incSphSe(); - /* 80BFA890 */ ~_GlSph_Mng_c(); -}; - -struct _GlSph_LstInfo_c { - /* 80BFA900 */ ~_GlSph_LstInfo_c(); - /* 80BFA93C */ _GlSph_LstInfo_c(); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct LIGHT_INFLUENCE {}; - -struct JPABaseEmitter { - /* 8027EC60 */ void deleteAllParticle(); -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80BF9AD4 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -359,9 +123,6 @@ extern "C" void deleteAllParticle__14JPABaseEmitterFv(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSVECAdd(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void __ptmf_scall(); @@ -373,8 +134,6 @@ extern "C" void _restgpr_21(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; @@ -382,7 +141,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -558,25 +316,30 @@ SECTION_DATA static u8 l_colorCB[4] = { #pragma pop /* 80BFAAC0-80BFAAE0 -00001 0020+00 1/0 0/0 0/0 .data l_daGlwSph_Method */ -SECTION_DATA static void* l_daGlwSph_Method[8] = { - (void*)daGlwSph_Create__FP10fopAc_ac_c, - (void*)daGlwSph_Delete__FP10daGlwSph_c, - (void*)daGlwSph_Execute__FP10daGlwSph_c, - (void*)NULL, - (void*)daGlwSph_Draw__FP10daGlwSph_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daGlwSph_Method = { + (process_method_func)daGlwSph_Create__FP10fopAc_ac_c, + (process_method_func)daGlwSph_Delete__FP10daGlwSph_c, + (process_method_func)daGlwSph_Execute__FP10daGlwSph_c, + 0, + (process_method_func)daGlwSph_Draw__FP10daGlwSph_c, }; /* 80BFAAE0-80BFAB10 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_glowSphere */ -SECTION_DATA extern void* g_profile_Obj_glowSphere[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x017B0000, (void*)&g_fpcLf_Method, - (void*)0x0000098C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x028B0000, (void*)&l_daGlwSph_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_glowSphere = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_glowSphere, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daGlwSph_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 651, // mPriority + &l_daGlwSph_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BFAB10-80BFAB1C 000140 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ @@ -669,7 +432,8 @@ asm daGlwSph_HIO_c::daGlwSph_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { +// asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { +extern "C" asm void __dt__18fOpAcm_HIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere/__dt__18fOpAcm_HIO_entry_cFv.s" } @@ -679,7 +443,8 @@ asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere/__dt__14mDoHIO_entry_cFv.s" } @@ -876,7 +641,8 @@ asm void daGlwSph_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { +// asm cM3dGSph::~cM3dGSph() { +extern "C" asm void __dt__8cM3dGSphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere/__dt__8cM3dGSphFv.s" } @@ -886,7 +652,8 @@ asm cM3dGSph::~cM3dGSph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere/__dt__8cM3dGAabFv.s" } @@ -896,7 +663,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere/__dt__10dCcD_GSttsFv.s" } @@ -906,7 +674,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere/__dt__12dBgS_AcchCirFv.s" } @@ -916,7 +685,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere/__dt__12dBgS_ObjAcchFv.s" } @@ -926,7 +696,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere/__dt__12J3DFrameCtrlFv.s" } @@ -1239,7 +1010,8 @@ asm void _GlSph_Mng_c::incSphSe() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_gm/d_a_obj_gm.cpp b/rel/d/a/obj/d_a_obj_gm/d_a_obj_gm.cpp index 9897739a47a..7e1e65b5d7c 100644 --- a/rel/d/a/obj/d_a_obj_gm/d_a_obj_gm.cpp +++ b/rel/d/a/obj/d_a_obj_gm/d_a_obj_gm.cpp @@ -1,125 +1,14 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_gm -// +/** + * @file d_a_obj_gm.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_gm/d_a_obj_gm.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_gm_class {}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObj_Gm_HIO_c { - /* 80BFB14C */ daObj_Gm_HIO_c(); - /* 80BFD284 */ ~daObj_Gm_HIO_c(); -}; - -struct daObj { - /* 800372A0 */ void make_eff_break_gm_kotubo(fopAc_ac_c*); - /* 80037330 */ void make_eff_break_gm_ootubo(fopAc_ac_c*); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dCcU_AtInfo {}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80BFD158 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80BFD1C8 */ ~dBgS_AcchCir(); -}; -struct csXyz {}; -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct cBgS_LinChk {}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); -}; - -struct _GXTexObj {}; - -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -229,7 +118,6 @@ extern "C" void MtxPull__Fv(); extern "C" void __ct__10Z2CreatureFv(); extern "C" void init__10Z2CreatureFP3VecP3VecUcUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); extern "C" void __construct_array(); extern "C" void _savegpr_26(); extern "C" void _savegpr_27(); @@ -239,8 +127,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; @@ -248,7 +134,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" void __register_global_object(); @@ -368,25 +253,30 @@ static dCcD_SrcSph cc_sph_src = { }; /* 80BFD4D4-80BFD4F4 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Gm_Method */ -SECTION_DATA static void* l_daObj_Gm_Method[8] = { - (void*)daObj_Gm_Create__FP10fopAc_ac_c, - (void*)daObj_Gm_Delete__FP12obj_gm_class, - (void*)daObj_Gm_Execute__FP12obj_gm_class, - (void*)daObj_Gm_IsDelete__FP12obj_gm_class, - (void*)daObj_Gm_Draw__FP12obj_gm_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObj_Gm_Method = { + (process_method_func)daObj_Gm_Create__FP10fopAc_ac_c, + (process_method_func)daObj_Gm_Delete__FP12obj_gm_class, + (process_method_func)daObj_Gm_Execute__FP12obj_gm_class, + (process_method_func)daObj_Gm_IsDelete__FP12obj_gm_class, + (process_method_func)daObj_Gm_Draw__FP12obj_gm_class, }; /* 80BFD4F4-80BFD524 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_GM */ -SECTION_DATA extern void* g_profile_OBJ_GM[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x002E0000, (void*)&g_fpcLf_Method, - (void*)0x00000AF4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00390000, (void*)&l_daObj_Gm_Method, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_GM = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_GM, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(obj_gm_class), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 57, // mPriority + &l_daObj_Gm_Method, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BFD524-80BFD530 00015C 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ @@ -897,7 +787,8 @@ extern "C" asm void __dt__10dCcD_GSttsFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gm/d_a_obj_gm/__dt__12dBgS_ObjAcchFv.s" } @@ -907,7 +798,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gm/d_a_obj_gm/__dt__12dBgS_AcchCirFv.s" } diff --git a/rel/d/a/obj/d_a_obj_goGate/d_a_obj_goGate.cpp b/rel/d/a/obj/d_a_obj_goGate/d_a_obj_goGate.cpp index fecd748fdaf..19d72852da5 100644 --- a/rel/d/a/obj/d_a_obj_goGate/d_a_obj_goGate.cpp +++ b/rel/d/a/obj/d_a_obj_goGate/d_a_obj_goGate.cpp @@ -1,110 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_goGate -// +/** + * @file d_a_obj_goGate.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_goGate/d_a_obj_goGate.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80BFD6DC */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct daGoGate_c { - /* 80BFD724 */ void setBaseMtx(); - /* 80BFD7C0 */ void CreateHeap(); - /* 80BFD82C */ void create(); - /* 80BFD984 */ void Execute(f32 (**)[3][4]); - /* 80BFD9D4 */ void moveGate(); - /* 80BFDAD8 */ void init_modeWait(); - /* 80BFDAE4 */ void modeWait(); - /* 80BFDAE8 */ void init_modeMoveOpen(); - /* 80BFDAF4 */ void modeMoveOpen(); - /* 80BFDC04 */ void init_modeMoveClose(); - /* 80BFDC10 */ void modeMoveClose(); - /* 80BFDD20 */ void setSe(); - /* 80BFDDDC */ void Draw(); - /* 80BFDE80 */ void Delete(); -}; - -struct daGoGate_HIO_c { - /* 80BFD6AC */ daGoGate_HIO_c(); - /* 80BFDF3C */ ~daGoGate_HIO_c(); -}; - -struct cXyz {}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -166,19 +68,11 @@ extern "C" void cLib_addCalc__FPfffff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -250,25 +144,30 @@ SECTION_DATA static u8 mode_proc[36] = { #pragma pop /* 80BFE078-80BFE098 -00001 0020+00 1/0 0/0 0/0 .data l_daGoGate_Method */ -SECTION_DATA static void* l_daGoGate_Method[8] = { - (void*)daGoGate_Create__FP10fopAc_ac_c, - (void*)daGoGate_Delete__FP10daGoGate_c, - (void*)daGoGate_Execute__FP10daGoGate_c, - (void*)NULL, - (void*)daGoGate_Draw__FP10daGoGate_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daGoGate_Method = { + (process_method_func)daGoGate_Create__FP10fopAc_ac_c, + (process_method_func)daGoGate_Delete__FP10daGoGate_c, + (process_method_func)daGoGate_Execute__FP10daGoGate_c, + 0, + (process_method_func)daGoGate_Draw__FP10daGoGate_c, }; /* 80BFE098-80BFE0C8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_GoGate */ -SECTION_DATA extern void* g_profile_Obj_GoGate[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x003E0000, (void*)&g_fpcLf_Method, - (void*)0x000005B8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01F80000, (void*)&l_daGoGate_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_GoGate = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_GoGate, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daGoGate_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 504, // mPriority + &l_daGoGate_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BFE0C8-80BFE0F0 0000B8 0028+00 1/1 0/0 0/0 .data __vt__10daGoGate_c */ @@ -313,7 +212,8 @@ asm daGoGate_HIO_c::daGoGate_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_goGate/d_a_obj_goGate/__dt__14mDoHIO_entry_cFv.s" } diff --git a/rel/d/a/obj/d_a_obj_gomikabe/d_a_obj_gomikabe.cpp b/rel/d/a/obj/d_a_obj_gomikabe/d_a_obj_gomikabe.cpp index feb7bcd40b0..32d4232c0d4 100644 --- a/rel/d/a/obj/d_a_obj_gomikabe/d_a_obj_gomikabe.cpp +++ b/rel/d/a/obj/d_a_obj_gomikabe/d_a_obj_gomikabe.cpp @@ -1,158 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_gomikabe -// +/** + * @file d_a_obj_gomikabe.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_gomikabe/d_a_obj_gomikabe.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz { - /* 80BFF8C8 */ csXyz(); - /* 802673F4 */ csXyz(s16, s16, s16); - /* 8026745C */ void operator+=(csXyz&); - /* 80BFEA24 */ ~csXyz(); -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct fopAcM_wt_c { - /* 8001DD84 */ void waterCheck(cXyz const*); - - static f32 mWaterY[1 + 1 /* padding */]; -}; - -struct daObjGOMIKABE_c { - /* 80BFE244 */ void initCcCylinder(); - /* 80BFE2CC */ void SetCcCyl(); - /* 80BFE47C */ void WaitAction(); - /* 80BFE4C4 */ void BreakChk(); - /* 80BFE52C */ void BreakSet(); - /* 80BFEA60 */ void getWaterStream(cXyz&, cXyz&, f32); - /* 80BFEB90 */ void SpeedSet(); - /* 80BFED54 */ void BreakAction(); - /* 80BFED74 */ void CheckCull(); - /* 80BFEE24 */ void checkViewArea(cXyz); - /* 80BFEEA8 */ void Action(); - /* 80BFEF20 */ void setBaseMtx(); - /* 80BFEF84 */ void setBaseMtx2(); - /* 80BFF064 */ void CreateHeap(); - /* 80BFF164 */ void create(); - /* 80BFF8D8 */ void Create(); - /* 80BFF938 */ void Execute(f32 (**)[3][4]); - /* 80BFFA00 */ void Draw(); - /* 80BFFB1C */ void Delete(); -}; - -struct daObjGOMIKABE_HIO_c { - /* 80BFE22C */ daObjGOMIKABE_HIO_c(); - /* 80BFFB74 */ ~daObjGOMIKABE_HIO_c(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C6B8 */ void getObjectResName2Index(char const*, char const*); -}; - -struct dBgW_Base {}; - -struct dBgW {}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80BFF794 */ ~dBgS_ObjAcch(); - /* 80BFF804 */ dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80BFF858 */ ~dBgS_AcchCir(); -}; - -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct J3DModel {}; // // Forward References: @@ -263,8 +118,6 @@ extern "C" void cLib_addCalc2__FPffff(); extern "C" void cLib_offsetPos__FP4cXyzPC4cXyzsPC4cXyz(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void __construct_array(); extern "C" void _savegpr_19(); extern "C" void _savegpr_23(); @@ -280,8 +133,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; @@ -289,8 +140,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -310,25 +159,30 @@ SECTION_DEAD static char const* const stringBase_80BFFCF4 = "GomiKabe"; SECTION_DATA static void* l_arcName = (void*)&d_a_obj_gomikabe__stringBase0; /* 80BFFD34-80BFFD54 -00001 0020+00 1/0 0/0 0/0 .data l_daObjGOMIKABE_Method */ -SECTION_DATA static void* l_daObjGOMIKABE_Method[8] = { - (void*)daObjGOMIKABE_Create__FP10fopAc_ac_c, - (void*)daObjGOMIKABE_Delete__FP15daObjGOMIKABE_c, - (void*)daObjGOMIKABE_Execute__FP15daObjGOMIKABE_c, - (void*)daObjGOMIKABE_IsDelete__FP15daObjGOMIKABE_c, - (void*)daObjGOMIKABE_Draw__FP15daObjGOMIKABE_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjGOMIKABE_Method = { + (process_method_func)daObjGOMIKABE_Create__FP10fopAc_ac_c, + (process_method_func)daObjGOMIKABE_Delete__FP15daObjGOMIKABE_c, + (process_method_func)daObjGOMIKABE_Execute__FP15daObjGOMIKABE_c, + (process_method_func)daObjGOMIKABE_IsDelete__FP15daObjGOMIKABE_c, + (process_method_func)daObjGOMIKABE_Draw__FP15daObjGOMIKABE_c, }; /* 80BFFD54-80BFFD84 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_GOMIKABE */ -SECTION_DATA extern void* g_profile_Obj_GOMIKABE[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x013E0000, (void*)&g_fpcLf_Method, - (void*)0x000013C4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02070000, (void*)&l_daObjGOMIKABE_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_GOMIKABE = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_GOMIKABE, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjGOMIKABE_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 519, // mPriority + &l_daObjGOMIKABE_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80BFFD84-80BFFD90 000054 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ @@ -602,7 +456,8 @@ asm void daObjGOMIKABE_c::BreakSet() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm csXyz::~csXyz() { +// asm csXyz::~csXyz() { +extern "C" asm void __dt__5csXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gomikabe/d_a_obj_gomikabe/__dt__5csXyzFv.s" } @@ -917,7 +772,8 @@ extern "C" asm void __dt__8cM3dGAabFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gomikabe/d_a_obj_gomikabe/__dt__12dBgS_ObjAcchFv.s" } @@ -927,7 +783,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::dBgS_ObjAcch() { +// asm dBgS_ObjAcch::dBgS_ObjAcch() { +extern "C" asm void __ct__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gomikabe/d_a_obj_gomikabe/__ct__12dBgS_ObjAcchFv.s" } @@ -937,14 +794,16 @@ asm dBgS_ObjAcch::dBgS_ObjAcch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gomikabe/d_a_obj_gomikabe/__dt__12dBgS_AcchCirFv.s" } #pragma pop /* 80BFF8C8-80BFF8CC 001788 0004+00 1/1 0/0 0/0 .text __ct__5csXyzFv */ -csXyz::csXyz() { +// csXyz::csXyz() { +extern "C" asm void __ct__5csXyzFv() { /* empty function */ } diff --git a/rel/d/a/obj/d_a_obj_gpTaru/d_a_obj_gpTaru.cpp b/rel/d/a/obj/d_a_obj_gpTaru/d_a_obj_gpTaru.cpp index 27a41fe4c34..575c8fdd2ce 100644 --- a/rel/d/a/obj/d_a_obj_gpTaru/d_a_obj_gpTaru.cpp +++ b/rel/d/a/obj/d_a_obj_gpTaru/d_a_obj_gpTaru.cpp @@ -1,254 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_gpTaru -// +/** + * @file d_a_obj_gpTaru.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_gpTaru/d_a_obj_gpTaru.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 8057D1B0 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct Vec {}; -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266B84 */ void operator*(f32) const; -}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static u8 mGndCheck[84]; -}; - -struct fOpAcm_HIO_entry_c { - /* 8057D154 */ ~fOpAcm_HIO_entry_c(); -}; - -struct daGpTaru_c { - /* 8057D1F8 */ void setBaseMtx(); - /* 8057D2D0 */ void CreateHeap(); - /* 8057D33C */ void create(); - /* 8057D7CC */ void createHeapCallBack(fopAc_ac_c*); - /* 8057DB3C */ void chkSinkAll(); - /* 8057DB60 */ void chkWaterLineIn(); - /* 8057DB84 */ void bgCheck(); - /* 8057E224 */ void Execute(); - /* 8057E494 */ void mode_proc_call(); - /* 8057E5DC */ void mode_init_wait(); - /* 8057E618 */ void mode_proc_wait(); - /* 8057E63C */ void mode_init_carry(); - /* 8057E660 */ void mode_proc_carry(); - /* 8057E700 */ void mode_init_drop(); - /* 8057E72C */ void mode_proc_drop(); - /* 8057E750 */ void mode_init_roll(); - /* 8057E768 */ void mode_proc_roll(); - /* 8057EBA4 */ void mode_init_exploInit(); - /* 8057EC60 */ void mode_proc_exploInit(); - /* 8057EE2C */ void mode_init_explosion(); - /* 8057EFB0 */ void mode_proc_explosion(); - /* 8057EFFC */ void mode_init_sink(); - /* 8057F014 */ void mode_proc_sink(); - /* 8057F104 */ void breakEffSet(); - /* 8057F284 */ void Draw(); - /* 8057F328 */ void Delete(); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; -}; - -struct daGpTaru_HIO_c { - /* 8057D0CC */ daGpTaru_HIO_c(); - /* 8057F458 */ ~daGpTaru_HIO_c(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct JPABaseEmitter {}; - -struct dPa_modelEcallBack { - /* 8004AC00 */ void setModel(JPABaseEmitter*, J3DModelData*, dKy_tevstr_c const&, u8, void*, u8, - u8); - - static u8 mEcallback[4]; -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); - /* 8057D690 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 800844F8 */ void GetTgHitObj(); - /* 80084548 */ void GetTgHitGObj(); - /* 80084658 */ void ChkCoHit(); - /* 800846F0 */ void GetCoHitObj(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjGndChk { - /* 8057EB2C */ ~dBgS_ObjGndChk(); -}; - -struct dBgS_ObjAcch { - /* 8057D75C */ ~dBgS_ObjAcch(); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 8057D6EC */ ~dBgS_AcchCir(); -}; - -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGPla { - /* 8057DAF4 */ ~cM3dGPla(); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 8057D600 */ ~cM3dGCyl(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 8057D648 */ ~cM3dGAab(); -}; - -struct cCcD_Obj { - /* 80263A48 */ void GetAc(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 8057F410 */ ~cCcD_GStts(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; - -struct cBgS { - /* 800744A0 */ void GroundCross(cBgS_GndChk*); - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AD8B0 */ void seStop(JAISoundID, u32); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct WIND_INFLUENCE {}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -379,12 +138,6 @@ extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStop__7Z2SeMgrF10JAISoundIDUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSVECAdd(); -extern "C" void PSVECScale(); -extern "C" void PSVECSquareMag(); -extern "C" void C_VECReflect(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_25(); extern "C" void _savegpr_26(); @@ -392,8 +145,6 @@ extern "C" void _savegpr_28(); extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -402,10 +153,7 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" u8 mGndCheck__11fopAcM_gc_c[84]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" u8 mEcallback__18dPa_modelEcallBack[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -560,25 +308,30 @@ SECTION_DATA static u8 effName[16] = { }; /* 8057F7A4-8057F7C4 -00001 0020+00 1/0 0/0 0/0 .data l_daGpTaru_Method */ -SECTION_DATA static void* l_daGpTaru_Method[8] = { - (void*)daGpTaru_Create__FP10fopAc_ac_c, - (void*)daGpTaru_Delete__FP10daGpTaru_c, - (void*)daGpTaru_Execute__FP10daGpTaru_c, - (void*)NULL, - (void*)daGpTaru_Draw__FP10daGpTaru_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daGpTaru_Method = { + (process_method_func)daGpTaru_Create__FP10fopAc_ac_c, + (process_method_func)daGpTaru_Delete__FP10daGpTaru_c, + (process_method_func)daGpTaru_Execute__FP10daGpTaru_c, + 0, + (process_method_func)daGpTaru_Draw__FP10daGpTaru_c, }; /* 8057F7C4-8057F7F4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_GpTaru */ -SECTION_DATA extern void* g_profile_Obj_GpTaru[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x016B0000, (void*)&g_fpcLf_Method, - (void*)0x000009AC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01FD0000, (void*)&l_daGpTaru_Method, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_GpTaru = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_GpTaru, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daGpTaru_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 509, // mPriority + &l_daGpTaru_Method, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 8057F7F4-8057F824 00016C 0030+00 2/2 0/0 0/0 .data __vt__14dBgS_ObjGndChk */ @@ -697,7 +450,8 @@ asm daGpTaru_HIO_c::daGpTaru_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { +// asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { +extern "C" asm void __dt__18fOpAcm_HIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gpTaru/d_a_obj_gpTaru/__dt__18fOpAcm_HIO_entry_cFv.s" } @@ -707,7 +461,8 @@ asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gpTaru/d_a_obj_gpTaru/__dt__14mDoHIO_entry_cFv.s" } @@ -804,7 +559,8 @@ asm void daGpTaru_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gpTaru/d_a_obj_gpTaru/__dt__8cM3dGCylFv.s" } @@ -814,7 +570,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gpTaru/d_a_obj_gpTaru/__dt__8cM3dGAabFv.s" } @@ -824,7 +581,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gpTaru/d_a_obj_gpTaru/__dt__10dCcD_GSttsFv.s" } @@ -834,7 +592,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gpTaru/d_a_obj_gpTaru/__dt__12dBgS_AcchCirFv.s" } @@ -844,7 +603,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gpTaru/d_a_obj_gpTaru/__dt__12dBgS_ObjAcchFv.s" } @@ -903,7 +663,8 @@ static asm void bound(cXyz* param_0, cBgS_PolyInfo const& param_1, f32 param_2) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGPla::~cM3dGPla() { +// asm cM3dGPla::~cM3dGPla() { +extern "C" asm void __dt__8cM3dGPlaFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gpTaru/d_a_obj_gpTaru/__dt__8cM3dGPlaFv.s" } @@ -1186,7 +947,8 @@ asm void daGpTaru_c::mode_proc_roll() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +// asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +extern "C" asm void __dt__14dBgS_ObjGndChkFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gpTaru/d_a_obj_gpTaru/__dt__14dBgS_ObjGndChkFv.s" } @@ -1430,7 +1192,8 @@ static asm void daGpTaru_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gpTaru/d_a_obj_gpTaru/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.cpp b/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.cpp index 9603b7ca04b..ea0dfff1e60 100644 --- a/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.cpp +++ b/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.cpp @@ -1,527 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_gra2 -// +/** + * @file d_a_obj_gra2.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.h" #include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct Vec {}; - -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266C18 */ void operator/(f32) const; - /* 80C04BAC */ cXyz(); - /* 80C04C40 */ ~cXyz(); -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CDD4 */ void transM(cXyz const&); - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF0C */ void ZXYrotS(csXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct mDoExt_morf_c { - /* 8000FB7C */ void setMorf(f32); -}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DModelData {}; - -struct Z2Creature { - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; - -struct mDoExt_McaMorfSO { - /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, - int, Z2Creature*, u32, u32); - /* 800111EC */ void modelCalc(); - /* 80011310 */ void stopZelAnime(); -}; - -struct fopAc_ac_c {}; - -struct fopAcM_lc_c { - /* 8001DC68 */ void lineCheck(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct daTagGra_c { - /* 80C0CF10 */ void getGraPos(); -}; - -struct daPy_py_c { - /* 8015F3FC */ void getAttentionOffsetY(); -}; - -struct dBgW {}; - -struct J3DModel {}; - -struct J3DJoint {}; - -struct daObj_GrA_c { - struct daObj_GrA_prtclMngr_c { - /* 80C04E14 */ ~daObj_GrA_prtclMngr_c(); - /* 80C04E50 */ daObj_GrA_prtclMngr_c(); - }; - - /* 80BFFF58 */ void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*); - /* 80BFFF70 */ daObj_GrA_c(); - /* 80C0011C */ ~daObj_GrA_c(); - /* 80C003CC */ void create(); - /* 80C00614 */ void CreateHeap(); - /* 80C00790 */ void Delete(); - /* 80C00804 */ void Execute(f32 (**)[3][4]); - /* 80C00A44 */ void Draw(); - /* 80C00ACC */ void jointCtrl(J3DJoint*, J3DModel*); - /* 80C00D5C */ void getResName(); - /* 80C00D74 */ void getMode(); - /* 80C00DF8 */ void getPathNo(); - /* 80C00E04 */ void getTagNo(); - /* 80C00E10 */ void getJumpType(); - /* 80C00E1C */ void isDelete(); - /* 80C00EFC */ void restart(); - /* 80C010D4 */ void init(); - /* 80C013B0 */ void setBaseAnm(int, f32); - /* 80C014F4 */ void setFaceAnm(int, bool, f32); - /* 80C01698 */ void setFaceBtp(int); - /* 80C0178C */ void setBaseMotion(int, f32); - /* 80C017AC */ void setFaceMotion(int, f32); - /* 80C017F0 */ void calcMotion(); - /* 80C018C0 */ void checkProcess(int (daObj_GrA_c::*)(void*)); - /* 80C018F4 */ void setProcess(int (daObj_GrA_c::*)(void*)); - /* 80C019B8 */ void setParam(); - /* 80C01C18 */ void checkEvent(); - /* 80C01D7C */ void mainProc(); - /* 80C01FE4 */ void adjustShapeAngle(); - /* 80C01FE8 */ void setMtx(int); - /* 80C02614 */ void setCollisions(); - /* 80C02970 */ void setAttnPos(); - /* 80C02A5C */ void drawOtherMdls(); - /* 80C02A60 */ bool dbgDraw(); - /* 80C02A68 */ void ppMoveInit(); - /* 80C02AD4 */ void setLookMode(int); - /* 80C02AE8 */ void lookat(); - /* 80C0308C */ void hitChk(); - /* 80C031E4 */ void wait(void*); - /* 80C0335C */ void talk(void*); - /* 80C035B8 */ void ctrlMsgAnm(int&, int&, fopAc_ac_c*); - /* 80C03720 */ void checkTagGraSub(fopAc_ac_c*); - /* 80C03764 */ void fallAbyssCheck(); - /* 80C03830 */ void setPrtcl(); - /* 80C03B14 */ void base000(int); - /* 80C03B48 */ void base001(int); - /* 80C03B7C */ void base003(int); - /* 80C03C1C */ void base004(int); - /* 80C03CBC */ void base005(int); - /* 80C03D54 */ void base006(int); - /* 80C03D88 */ void base007(int); - /* 80C03DF0 */ void base008(int); - /* 80C03E74 */ void base009(int); - /* 80C03F14 */ void base010(int); - /* 80C03FC0 */ void base013(int); - /* 80C04118 */ void base016(int); - /* 80C04180 */ void base017(int); - /* 80C041E8 */ void base018(int); - /* 80C04260 */ void base019(int); - /* 80C042D4 */ void base020(int); - /* 80C04308 */ void base021(int); - /* 80C0433C */ void base022(int); - /* 80C04370 */ void base023(int); - /* 80C043A4 */ void base024(int); - /* 80C043D8 */ void base025(int); - /* 80C0440C */ void base026(int); - /* 80C04440 */ void face000(int); - /* 80C04478 */ void face003(int); - /* 80C04518 */ void face004(int); - /* 80C045B8 */ void face005(int); - /* 80C045F0 */ void face006(int); - /* 80C04628 */ void face007(int); - /* 80C04660 */ void face008(int); - /* 80C04700 */ void face009(int); - /* 80C047A0 */ void face010(int); - /* 80C047D8 */ void face011(int); - /* 80C04810 */ void face012(int); - /* 80C04848 */ void face016(int); - /* 80C04880 */ void face017(int); - /* 80C048B8 */ void face999(int); - /* 80C048F8 */ void evtcutTalk(int, int); - /* 80C04A0C */ void setFaceTalkAfter(); - /* 80C0536C */ void getSrchCircleR(); - /* 80C053C4 */ void standWait(void*); - /* 80C05920 */ void walk(void*); - /* 80C05F64 */ void defence(void*); - /* 80C061F4 */ void toStone(void*); - /* 80C067D8 */ void step(void*); - /* 80C06CDC */ void rollReturn(void*); - /* 80C0780C */ void soldierDemoSkip(); - /* 80C078A8 */ void soldierDemo(void*); - /* 80C07C40 */ void getSrchLinkR(); - /* 80C07C98 */ void getSrchGraR(); - /* 80C07CF0 */ void getSpeed(); - /* 80C07D38 */ void standRoll(void*); - /* 80C083F0 */ void rollDemo(void*); - /* 80C08804 */ void rollAttack(void*); - /* 80C09298 */ void rollAttacked(void*); - /* 80C09918 */ void rollEscape(void*); - /* 80C09F08 */ void rollLanding(); - /* 80C0A018 */ void thrown(void*); - /* 80C0A120 */ void demo_camera(); - /* 80C0AF94 */ void rollAttackedDemo(); - /* 80C0B9AC */ void graThrowDemo(); - /* 80C0BD90 */ void setCarryStatus(); - /* 80C0BE5C */ void checkThrow(); - /* 80C0BF34 */ void calcCatchPos(f32, int); - /* 80C0C348 */ void initCrazyBeforeCatch(int); - /* 80C0C364 */ void executeCrazyBeforeCatch(); - /* 80C0C3E0 */ void initCrazyCatch(int); - /* 80C0C478 */ void executeCrazyCatch(); - /* 80C0C5F0 */ void initCrazyThrow(int); - /* 80C0C690 */ void executeCrazyThrow(); - /* 80C0C84C */ void initCrazyAttack(); - /* 80C0CA64 */ void executeCrazyJumping(); - /* 80C0CDBC */ void modeChangeCheck(); - /* 80C0CF98 */ void checkGraSub(fopAc_ac_c*); - /* 80C0D000 */ void waitDemo(void*); - /* 80C0D2FC */ void skipDemoGra(); - /* 80C0D3E0 */ void startDemo(void*); - /* 80C0EFC4 */ void turn(s16, f32, int); - /* 80C0F17C */ void turn_step(s16, int, int, int); - /* 80C0F330 */ void chkFindPlayer2(int, s16); - /* 80C0F668 */ void chkPointInArea(cXyz, cXyz, cXyz, s16); - /* 80C0F5A4 */ void chkPointInArea(cXyz, cXyz, f32, f32, f32, s16); - /* 80C0F6E0 */ void chkActorInSight2(fopAc_ac_c*, f32, s16); - /* 80C0F7EC */ void getAttentionPos(fopAc_ac_c*); - /* 80C0F860 */ void standWaitJump(void*); - - static u8 mBaseMotionList[264]; - static u8 mFaceMotionList[168]; -}; - -struct daObj_GrA_Param_c { - /* 80C04B1C */ ~daObj_GrA_Param_c(); - - static u8 const m[192]; -}; - -struct daBaseNpc_path_c { - /* 8014D998 */ daBaseNpc_path_c(); - /* 8014D9A8 */ void isPath(); - /* 8014D9BC */ void setPathInfo(u8, s8, s8); - /* 8014DA48 */ void reverseDir(); - /* 8014DA64 */ void chkPnt(cXyz); - /* 8014DAC4 */ void setNextPnt(); - /* 8014DB04 */ void getIdx(); - /* 8014DB14 */ void getPntPos(u16); - /* 80C04B64 */ ~daBaseNpc_path_c(); -}; - -struct cBgS_PolyInfo {}; - -struct daBaseNpc_moveBgActor_c { - /* 8014F4B4 */ daBaseNpc_moveBgActor_c(); - /* 8014F60C */ void - MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*), u32); - /* 8014F6FC */ void MoveBGDelete(); - /* 8014F770 */ void MoveBGExecute(); - /* 80C04E9C */ ~daBaseNpc_moveBgActor_c(); - /* 80C04EFC */ bool Draw(); - /* 80C04F04 */ bool Create(); - /* 80C04F0C */ bool IsDelete(); - /* 80C04F14 */ bool ToFore(); - /* 80C04F1C */ bool ToBack(); - /* 80C04F24 */ bool CreateHeap(); - /* 80C04F2C */ bool Execute(f32 (**)[3][4]); - /* 80C04F34 */ bool Delete(); -}; - -struct daBaseNpc_lookat_c { - /* 8014DBB4 */ void calc(fopAc_ac_c*, f32 (*)[4], s16); - /* 8014E634 */ void setMaxJntLmt(csXyz, int); - /* 8014E658 */ void setMinJntLmt(csXyz, int); - /* 8014E67C */ void setJntPos(cXyz, int); - /* 8014E6A0 */ void setAttnPos(cXyz*); - /* 8014E6AC */ void getRot(int); -}; - -struct J3DAnmTexPattern {}; - -struct J3DAnmTransformKey {}; - -struct daBaseNpc_c { - /* 8014E89C */ ~daBaseNpc_c(); - /* 8014EAD0 */ void execute(); - /* 8014EC50 */ void draw(f32); - /* 8014EE3C */ bool getResName(); - /* 8014EE44 */ void getTrnsfrmKeyAnmP(char*, int); - /* 8014EE80 */ void setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int); - /* 8014EEE4 */ void setBckAnm(J3DAnmTransform*, f32, int, int, int, bool); - /* 8014EF28 */ void getTexPtrnAnmP(char*, int); - /* 8014EF64 */ void setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int); - /* 8014EFA4 */ void attnSttsOn(int, int); - /* 8014EFF0 */ void setParam(); - /* 8014EFF4 */ void orderEvent(int, char*); - /* 8014F09C */ void mainProc(); - /* 8014F0A0 */ void setEnvTevColor(); - /* 8014F0FC */ void setRoomNo(); - /* 8014F140 */ bool btkCtrl(); - /* 8014F228 */ void allAnmPlay(); - /* 8014F38C */ void adjustShapeAngle(); - /* 8014F390 */ void setMtx(int); - /* 8014F4A0 */ void setCollisions(); - /* 8014F4A4 */ void setAttnPos(); - /* 8014F4A8 */ void drawOtherMdls(); - /* 8014F4AC */ bool dbgDraw(); - - static u8 mCcDCyl[68]; - static u8 mCcDSph[64]; -}; - -struct daBaseNpc_acMngr_c { - /* 8014D804 */ daBaseNpc_acMngr_c(); - /* 8014D81C */ void entry(fopAc_ac_c*); - /* 8014D838 */ void getActor(); - /* 80C04E54 */ ~daBaseNpc_acMngr_c(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); - /* 8006FB10 */ void StartQuake(int, int, cXyz); - /* 8006FD94 */ void StopQuake(int); - /* 8006FE5C */ void CheckQuake(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dSv_danBit_c { - /* 80034B98 */ void onSwitch(int); - /* 80034BE8 */ void isSwitch(int) const; -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); - /* 8003C6B8 */ void getObjectResName2Index(char const*, char const*); -}; - -struct dPa_levelEcallBack {}; - -struct dKy_tevstr_c {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); - /* 8004D6A4 */ void setPoly(u32, u16, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*, - csXyz const*, cXyz const*, int, dPa_levelEcallBack*, s8, - cXyz const*); -}; - -struct dBgS_AcchCir { - /* 80075F58 */ void SetWall(f32, f32); -}; - -struct dBgW_Base {}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct dBgS_Acch { - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct dPaPo_c { - /* 80050C9C */ void init(dBgS_Acch*, f32, f32); - /* 80051008 */ void setEffectCenter(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*, - csXyz const*, cXyz const*, s8, f32, f32); -}; - -struct dMsgObject_c { - /* 8023819C */ void getActor(); - /* 802383A4 */ void isMouthCheck(); -}; - -struct dMsgFlow_c { - /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**); - /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); - /* 80042914 */ void setSkipProc(void*, int (*)(void*, int), int); - /* 800429A8 */ void onSkipFade(); -}; - -struct dEvent_manager_c { - /* 80047A78 */ void endCheck(s16); - /* 800487F0 */ void ChkPresentEnd(); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcSph {}; - -struct dCcD_SrcCyl {}; - -struct dCcD_Sph { - /* 80084A34 */ void Set(dCcD_SrcSph const&); - /* 80C04C7C */ ~dCcD_Sph(); - /* 80C04D48 */ dCcD_Sph(); -}; - -struct dCcD_GStts { - /* 80083830 */ void Move(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 800842C0 */ void ChkAtHit(); - /* 80084460 */ void ChkTgHit(); - /* 800844F8 */ void GetTgHitObj(); - /* 80084658 */ void ChkCoHit(); - /* 800846F0 */ void GetCoHitObj(); -}; - -struct dCcD_GAtTgCoCommonBase { - /* 80083688 */ void GetAc(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct dCamera_c { - /* 801614AC */ void Start(); - /* 801614D0 */ void Stop(); - /* 8016300C */ void SetTrimSize(s32); - /* 80180AE0 */ void Set(cXyz, cXyz, f32, s16); - /* 80180BA0 */ void Reset(cXyz, cXyz, f32, s16); - /* 80180C18 */ void Reset(cXyz, cXyz); - /* 80181E64 */ void Eye(); - /* 80181E98 */ void Center(); -}; - -struct dBgS_LinkLinChk { - /* 80078030 */ dBgS_LinkLinChk(); - /* 8007808C */ ~dBgS_LinkLinChk(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dAttention_c { - /* 80C0F590 */ void getDistTable(int); - - static u8 dist_table[6552]; -}; - -struct cSGlobe { - /* 80271880 */ cSGlobe(cXyz const&); -}; - -struct cSAngle { - /* 80270F68 */ cSAngle(cSAngle const&); - /* 80270F98 */ cSAngle(s16); - /* 802710E8 */ void Inv() const; - /* 80271228 */ void operator-(s16) const; -}; - -struct cM3dGSph { - /* 8026F648 */ void SetC(cXyz const&); - /* 8026F708 */ void SetR(f32); - /* 80C04DCC */ ~cM3dGSph(); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80C04BB0 */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80C04BF8 */ ~cM3dGAab(); -}; - -struct cCcD_Obj { - /* 80263A48 */ void GetAc(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS_LinChk {}; - -struct cBgS_GndChk { - /* 80267C1C */ cBgS_GndChk(); - /* 80267C94 */ ~cBgS_GndChk(); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 80074618 */ void GetActorPointer(int) const; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DSys { - static u8 mCurrentMtx[48]; -}; - -struct J3DFrameCtrl { - /* 8032842C */ void checkPass(f32); -}; +#include "d/d_camera.h" // // Forward References: @@ -700,7 +184,6 @@ extern "C" u8 mFaceMotionList__11daObj_GrA_c[168]; // External References: // -SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); @@ -871,14 +354,6 @@ extern "C" void init__10Z2CreatureFP3VecP3VecUcUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void checkPass__12J3DFrameCtrlFf(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXConcat(); -extern "C" void PSMTXInverse(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); -extern "C" void PSVECSquareMag(); -extern "C" void PSVECSquareDistance(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void __ptmf_test(); @@ -899,11 +374,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void abs(); -extern "C" void strcmp(); -extern "C" void strcpy(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 dist_table__12dAttention_c[6552]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__8dCcD_Cyl[36]; @@ -914,13 +384,9 @@ extern "C" extern void* __vt__12cCcD_CylAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u8 g_dComIfGoat_gameInfo[4 + 4 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u32 __float_max; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; extern "C" void __register_global_object(); // @@ -2021,25 +1487,30 @@ SECTION_DATA u8 daObj_GrA_c::mFaceMotionList[168] = { }; /* 80C10734-80C10754 -00001 0020+00 1/0 0/0 0/0 .data daObj_GrA_MethodTable */ -SECTION_DATA static void* daObj_GrA_MethodTable[8] = { - (void*)daObj_GrA_Create__FPv, - (void*)daObj_GrA_Delete__FPv, - (void*)daObj_GrA_Execute__FPv, - (void*)daObj_GrA_IsDelete__FPv, - (void*)daObj_GrA_Draw__FPv, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObj_GrA_MethodTable = { + (process_method_func)daObj_GrA_Create__FPv, + (process_method_func)daObj_GrA_Delete__FPv, + (process_method_func)daObj_GrA_Execute__FPv, + (process_method_func)daObj_GrA_IsDelete__FPv, + (process_method_func)daObj_GrA_Draw__FPv, }; /* 80C10754-80C10784 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_GRA */ -SECTION_DATA extern void* g_profile_OBJ_GRA[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00210000, (void*)&g_fpcLf_Method, - (void*)0x000020A4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00130000, (void*)&daObj_GrA_MethodTable, - (void*)0x00040100, (void*)0x040E0000, +extern actor_process_profile_definition g_profile_OBJ_GRA = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_GRA, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObj_GrA_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 19, // mPriority + &daObj_GrA_MethodTable, // sub_method + 0x00040100, // mStatus + fopAc_NPC_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C10784-80C107E8 00091C 0064+00 2/2 0/0 0/0 .data __vt__11daObj_GrA_c */ @@ -4325,14 +3796,16 @@ asm daObj_GrA_Param_c::~daObj_GrA_Param_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daBaseNpc_path_c::~daBaseNpc_path_c() { +// asm daBaseNpc_path_c::~daBaseNpc_path_c() { +extern "C" asm void __dt__16daBaseNpc_path_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2/__dt__16daBaseNpc_path_cFv.s" } #pragma pop /* 80C04BAC-80C04BB0 004D8C 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */ -cXyz::cXyz() { +// cXyz::cXyz() { +extern "C" asm void __ct__4cXyzFv() { /* empty function */ } @@ -4340,7 +3813,8 @@ cXyz::cXyz() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2/__dt__8cM3dGCylFv.s" } @@ -4350,7 +3824,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2/__dt__8cM3dGAabFv.s" } @@ -4360,7 +3835,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2/__dt__4cXyzFv.s" } @@ -4370,7 +3846,8 @@ asm cXyz::~cXyz() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Sph::~dCcD_Sph() { +// asm dCcD_Sph::~dCcD_Sph() { +extern "C" asm void __dt__8dCcD_SphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2/__dt__8dCcD_SphFv.s" } @@ -4380,7 +3857,8 @@ asm dCcD_Sph::~dCcD_Sph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Sph::dCcD_Sph() { +// asm dCcD_Sph::dCcD_Sph() { +extern "C" asm void __ct__8dCcD_SphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2/__ct__8dCcD_SphFv.s" } @@ -4390,7 +3868,8 @@ asm dCcD_Sph::dCcD_Sph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { +// asm cM3dGSph::~cM3dGSph() { +extern "C" asm void __dt__8cM3dGSphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2/__dt__8cM3dGSphFv.s" } @@ -4417,7 +3896,8 @@ daObj_GrA_c::daObj_GrA_prtclMngr_c::daObj_GrA_prtclMngr_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daBaseNpc_acMngr_c::~daBaseNpc_acMngr_c() { +// asm daBaseNpc_acMngr_c::~daBaseNpc_acMngr_c() { +extern "C" asm void __dt__18daBaseNpc_acMngr_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2/__dt__18daBaseNpc_acMngr_cFv.s" } @@ -4428,7 +3908,8 @@ asm daBaseNpc_acMngr_c::~daBaseNpc_acMngr_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daBaseNpc_moveBgActor_c::~daBaseNpc_moveBgActor_c() { +// asm daBaseNpc_moveBgActor_c::~daBaseNpc_moveBgActor_c() { +extern "C" asm void __dt__23daBaseNpc_moveBgActor_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2/__dt__23daBaseNpc_moveBgActor_cFv.s" } @@ -4436,47 +3917,55 @@ asm daBaseNpc_moveBgActor_c::~daBaseNpc_moveBgActor_c() { /* 80C04EFC-80C04F04 0050DC 0008+00 1/0 0/0 0/0 .text Draw__23daBaseNpc_moveBgActor_cFv */ -bool daBaseNpc_moveBgActor_c::Draw() { +// bool daBaseNpc_moveBgActor_c::Draw() { +extern "C" bool Draw__23daBaseNpc_moveBgActor_cFv() { return true; } /* 80C04F04-80C04F0C 0050E4 0008+00 2/0 0/0 0/0 .text Create__23daBaseNpc_moveBgActor_cFv */ -bool daBaseNpc_moveBgActor_c::Create() { +// bool daBaseNpc_moveBgActor_c::Create() { +extern "C" bool Create__23daBaseNpc_moveBgActor_cFv() { return true; } /* 80C04F0C-80C04F14 0050EC 0008+00 2/0 0/0 0/0 .text IsDelete__23daBaseNpc_moveBgActor_cFv */ -bool daBaseNpc_moveBgActor_c::IsDelete() { +// bool daBaseNpc_moveBgActor_c::IsDelete() { +extern "C" bool IsDelete__23daBaseNpc_moveBgActor_cFv() { return true; } /* 80C04F14-80C04F1C 0050F4 0008+00 2/0 0/0 0/0 .text ToFore__23daBaseNpc_moveBgActor_cFv */ -bool daBaseNpc_moveBgActor_c::ToFore() { +// bool daBaseNpc_moveBgActor_c::ToFore() { +extern "C" bool ToFore__23daBaseNpc_moveBgActor_cFv() { return true; } /* 80C04F1C-80C04F24 0050FC 0008+00 2/0 0/0 0/0 .text ToBack__23daBaseNpc_moveBgActor_cFv */ -bool daBaseNpc_moveBgActor_c::ToBack() { +// bool daBaseNpc_moveBgActor_c::ToBack() { +extern "C" bool ToBack__23daBaseNpc_moveBgActor_cFv() { return true; } /* 80C04F24-80C04F2C 005104 0008+00 1/0 0/0 0/0 .text CreateHeap__23daBaseNpc_moveBgActor_cFv */ -bool daBaseNpc_moveBgActor_c::CreateHeap() { +// bool daBaseNpc_moveBgActor_c::CreateHeap() { +extern "C" bool CreateHeap__23daBaseNpc_moveBgActor_cFv() { return true; } /* 80C04F2C-80C04F34 00510C 0008+00 1/0 0/0 0/0 .text Execute__23daBaseNpc_moveBgActor_cFPPA3_A4_f */ -bool daBaseNpc_moveBgActor_c::Execute(f32 (**param_0)[3][4]) { +// bool daBaseNpc_moveBgActor_c::Execute(f32 (**param_0)[3][4]) { +extern "C" bool Execute__23daBaseNpc_moveBgActor_cFPPA3_A4_f() { return true; } /* 80C04F34-80C04F3C 005114 0008+00 1/0 0/0 0/0 .text Delete__23daBaseNpc_moveBgActor_cFv */ -bool daBaseNpc_moveBgActor_c::Delete() { +// bool daBaseNpc_moveBgActor_c::Delete() { +extern "C" bool Delete__23daBaseNpc_moveBgActor_cFv() { return true; } @@ -4884,7 +4373,8 @@ asm void daObj_GrA_c::modeChangeCheck() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daTagGra_c::getGraPos() { +// asm void daTagGra_c::getGraPos() { +extern "C" asm void getGraPos__10daTagGra_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2/getGraPos__10daTagGra_cFv.s" } @@ -4984,7 +4474,8 @@ asm void daObj_GrA_c::chkFindPlayer2(int param_0, s16 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dAttention_c::getDistTable(int param_0) { +// asm void dAttention_c::getDistTable(int param_0) { +extern "C" asm void getDistTable__12dAttention_cFi() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2/getDistTable__12dAttention_cFi.s" } diff --git a/rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock.cpp b/rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock.cpp index f9251f05ad4..bc5fa8e1fe7 100644 --- a/rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock.cpp +++ b/rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock.cpp @@ -1,212 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_gra_rock -// +/** + * @file d_a_obj_gra_rock.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTexPattern {}; - -struct mDoExt_btpAnm { - /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); - /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c {}; - -struct cCcD_Obj {}; - -struct daObjGraRock_c { - /* 80C110F8 */ void setAttnPos(); - /* 80C11444 */ void setBaseMtx(); - /* 80C114C0 */ void setPrtcl(); - /* 80C1157C */ void bombParticleSet(); - /* 80C11730 */ void setEnvTevColor(); - /* 80C1178C */ void setRoomNo(); - /* 80C117D0 */ void col_set(); - /* 80C11964 */ void checkHitAt(cCcD_Obj*); - /* 80C11970 */ void Create(); - /* 80C11B68 */ void CreateHeap(); - /* 80C11C64 */ void create(); - /* 80C11FF0 */ void Execute(f32 (**)[3][4]); - /* 80C120FC */ void Draw(); - /* 80C121C4 */ void Delete(); - - static u8 const mCcDCyl[68]; -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C6B8 */ void getObjectResName2Index(char const*, char const*); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 800844F8 */ void GetTgHitObj(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct dBgW_Base {}; - -struct dBgW {}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80C11F38 */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); -}; - -struct dBgS { - /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct dAttention_c { - /* 8007353C */ void LockonTarget(s32); - /* 800737E4 */ void LockonTruth(); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80C11EA8 */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80C11EF0 */ ~cM3dGAab(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS_GndChk { - /* 80267C1C */ cBgS_GndChk(); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80C11FA8 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -308,10 +107,6 @@ extern "C" void SetR__8cM3dGCylFf(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); extern "C" void _savegpr_24(); extern "C" void _savegpr_25(); extern "C" void _savegpr_27(); @@ -320,8 +115,6 @@ extern "C" void _restgpr_24(); extern "C" void _restgpr_25(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -329,8 +122,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -585,25 +376,30 @@ SECTION_DEAD static char const* const stringBase_80C1248B = "M_VBom_Zora.dzb"; #pragma pop /* 80C124B0-80C124D0 -00001 0020+00 1/0 0/0 0/0 .data l_daObjGraRock_Method */ -SECTION_DATA static void* l_daObjGraRock_Method[8] = { - (void*)daObjGraRock_create__FP10fopAc_ac_c, - (void*)daObjGraRock_Delete__FP14daObjGraRock_c, - (void*)daObjGraRock_Execute__FP14daObjGraRock_c, - (void*)daObjGraRock_IsDelete__FP14daObjGraRock_c, - (void*)daObjGraRock_Draw__FP14daObjGraRock_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjGraRock_Method = { + (process_method_func)daObjGraRock_create__FP10fopAc_ac_c, + (process_method_func)daObjGraRock_Delete__FP14daObjGraRock_c, + (process_method_func)daObjGraRock_Execute__FP14daObjGraRock_c, + (process_method_func)daObjGraRock_IsDelete__FP14daObjGraRock_c, + (process_method_func)daObjGraRock_Draw__FP14daObjGraRock_c, }; /* 80C124D0-80C12500 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_GraRock */ -SECTION_DATA extern void* g_profile_Obj_GraRock[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00890000, (void*)&g_fpcLf_Method, - (void*)0x000009CC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02610000, (void*)&l_daObjGraRock_Method, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_GraRock = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_GraRock, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjGraRock_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 609, // mPriority + &l_daObjGraRock_Method, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C12500-80C1250C 000064 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ @@ -668,7 +464,8 @@ asm void daObjGraRock_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock/__dt__8cM3dGCylFv.s" } @@ -678,7 +475,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock/__dt__8cM3dGAabFv.s" } @@ -688,7 +486,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock/__dt__12dBgS_ObjAcchFv.s" } @@ -698,7 +497,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater.cpp b/rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater.cpp index bbe34be4d4e..00b5b0cceba 100644 --- a/rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater.cpp +++ b/rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater.cpp @@ -1,136 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_groundwater -// +/** + * @file d_a_obj_groundwater.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C134F8 */ ~mDoHIO_entry_c(); -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DModelData { - /* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]); -}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c {}; - -struct daGrdWater_c { - /* 80C13540 */ void setBaseMtx(); - /* 80C13618 */ void CreateHeap(); - /* 80C139E4 */ void create(); - /* 80C13DB0 */ daGrdWater_c(); - /* 80C13FEC */ void Execute(f32 (**)[3][4]); - /* 80C14194 */ void init_modeWait(); - /* 80C141A0 */ void modeWait(); - /* 80C141A4 */ void init_modeLevelUpA(); - /* 80C1423C */ void modeLevelUpA(); - /* 80C142AC */ void init_modeLevelDownA(); - /* 80C14320 */ void modeLevelDownA(); - /* 80C1437C */ void init_modeLevelUpB(); - /* 80C14414 */ void modeLevelUpB(); - /* 80C14484 */ void init_modeLevelDownB(); - /* 80C144F8 */ void modeLevelDownB(); - /* 80C14554 */ void Draw(); - /* 80C147EC */ void Delete(); -}; - -struct daGrdWater_HIO_c { - /* 80C134AC */ daGrdWater_HIO_c(); - /* 80C148A8 */ ~daGrdWater_HIO_c(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW {}; -struct cBgS_PolyInfo {}; -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct J3DTexMtxInfo { - /* 80325794 */ void setEffectMtx(f32 (*)[4]); -}; - -struct J3DModel { - /* 80327BD4 */ void calcAnmMtx(); -}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80C13FA4 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -201,9 +78,6 @@ extern "C" void setEffectMtx__13J3DTexMtxInfoFPA4_f(); extern "C" void simpleCalcMaterial__12J3DModelDataFUsPA4_f(); extern "C" void calcAnmMtx__8J3DModelFv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void C_MTXLightPerspective(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_25(); extern "C" void _savegpr_28(); @@ -211,13 +85,8 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_25(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern u8 const j3dDefaultMtx[48]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void __register_global_object(); // @@ -311,25 +180,30 @@ SECTION_DATA static u8 l_mode_func[60] = { }; /* 80C14A94-80C14AB4 -00001 0020+00 1/0 0/0 0/0 .data l_daGrdWater_Method */ -SECTION_DATA static void* l_daGrdWater_Method[8] = { - (void*)daGrdWater_Create__FP10fopAc_ac_c, - (void*)daGrdWater_Delete__FP12daGrdWater_c, - (void*)daGrdWater_Execute__FP12daGrdWater_c, - (void*)NULL, - (void*)daGrdWater_Draw__FP12daGrdWater_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daGrdWater_Method = { + (process_method_func)daGrdWater_Create__FP10fopAc_ac_c, + (process_method_func)daGrdWater_Delete__FP12daGrdWater_c, + (process_method_func)daGrdWater_Execute__FP12daGrdWater_c, + 0, + (process_method_func)daGrdWater_Draw__FP12daGrdWater_c, }; /* 80C14AB4-80C14AE4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_GRDWATER */ -SECTION_DATA extern void* g_profile_GRDWATER[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00350000, (void*)&g_fpcLf_Method, - (void*)0x000006F4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01E90000, (void*)&l_daGrdWater_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_GRDWATER = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_GRDWATER, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daGrdWater_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 489, // mPriority + &l_daGrdWater_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C14AE4-80C14AF0 0000E8 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ @@ -381,7 +255,8 @@ asm daGrdWater_HIO_c::daGrdWater_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater/__dt__14mDoHIO_entry_cFv.s" } @@ -449,7 +324,8 @@ asm daGrdWater_c::daGrdWater_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_grz_rock/d_a_obj_grz_rock.cpp b/rel/d/a/obj/d_a_obj_grz_rock/d_a_obj_grz_rock.cpp index b99f0ffbb22..ad47c735771 100644 --- a/rel/d/a/obj/d_a_obj_grz_rock/d_a_obj_grz_rock.cpp +++ b/rel/d/a/obj/d_a_obj_grz_rock/d_a_obj_grz_rock.cpp @@ -1,127 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_grz_rock -// +/** + * @file d_a_obj_grz_rock.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_grz_rock/d_a_obj_grz_rock.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjGrzRock_c { - /* 80C14BD8 */ void setBaseMtx(); - /* 80C14C54 */ void setEnvTevColor(); - /* 80C14CB0 */ void setRoomNo(); - /* 80C14CF0 */ void setPrtcl(); - /* 80C14DA0 */ void Create(); - /* 80C14EE0 */ void CreateHeap(); - /* 80C14F50 */ void create(); - /* 80C1514C */ void Execute(f32 (**)[3][4]); - /* 80C151A4 */ void Draw(); - /* 80C15248 */ void Delete(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); - /* 8003C6B8 */ void getObjectResName2Index(char const*, char const*); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dBgW_Base {}; - -struct dBgW {}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80C150DC */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); -}; - -struct dBgS { - /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS_GndChk { - /* 80267C1C */ cBgS_GndChk(); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct J3DModel {}; // // Forward References: @@ -187,18 +71,12 @@ extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP extern "C" void __ct__11cBgS_GndChkFv(); extern "C" void ChkUsed__9cBgW_BgIdCFv(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void _savegpr_26(); extern "C" void _savegpr_29(); extern "C" void _restgpr_26(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; // // Declarations: @@ -314,25 +192,30 @@ SECTION_DEAD static char const* const stringBase_80C15380 = "grZRock.dzb"; #pragma pop /* 80C15390-80C153B0 -00001 0020+00 1/0 0/0 0/0 .data l_daObjGrzRock_Method */ -SECTION_DATA static void* l_daObjGrzRock_Method[8] = { - (void*)daObjGrzRock_create__FP10fopAc_ac_c, - (void*)daObjGrzRock_Delete__FP14daObjGrzRock_c, - (void*)daObjGrzRock_Execute__FP14daObjGrzRock_c, - (void*)daObjGrzRock_IsDelete__FP14daObjGrzRock_c, - (void*)daObjGrzRock_Draw__FP14daObjGrzRock_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjGrzRock_Method = { + (process_method_func)daObjGrzRock_create__FP10fopAc_ac_c, + (process_method_func)daObjGrzRock_Delete__FP14daObjGrzRock_c, + (process_method_func)daObjGrzRock_Execute__FP14daObjGrzRock_c, + (process_method_func)daObjGrzRock_IsDelete__FP14daObjGrzRock_c, + (process_method_func)daObjGrzRock_Draw__FP14daObjGrzRock_c, }; /* 80C153B0-80C153E0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_GrzRock */ -SECTION_DATA extern void* g_profile_Obj_GrzRock[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x008A0000, (void*)&g_fpcLf_Method, - (void*)0x00000804, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02620000, (void*)&l_daObjGrzRock_Method, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_GrzRock = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_GrzRock, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjGrzRock_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 610, // mPriority + &l_daObjGrzRock_Method, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C153E0-80C15404 000054 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ @@ -376,7 +259,8 @@ asm void daObjGrzRock_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_grz_rock/d_a_obj_grz_rock/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_h_saku/d_a_obj_h_saku.cpp b/rel/d/a/obj/d_a_obj_h_saku/d_a_obj_h_saku.cpp index 3f65681462d..194d535ef5d 100644 --- a/rel/d/a/obj/d_a_obj_h_saku/d_a_obj_h_saku.cpp +++ b/rel/d/a/obj/d_a_obj_h_saku/d_a_obj_h_saku.cpp @@ -1,146 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_h_saku -// +/** + * @file d_a_obj_h_saku.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_h_saku/d_a_obj_h_saku.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); - /* 8026745C */ void operator+=(csXyz&); -}; - -struct cXyz { - /* 80C157D4 */ ~cXyz(); -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE38 */ void scaleM(f32, f32, f32); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjH_Saku_c { - /* 80C1552C */ void BreakSet(); - /* 80C15810 */ void SpeedSet(cXyz*, cXyz*, f32); - /* 80C15A4C */ void Action(); - /* 80C15E00 */ void initBaseMtx(); - /* 80C15E44 */ void setBaseMtx(); - /* 80C161E8 */ void CreateHeap(); - /* 80C1629C */ void Create(); - /* 80C162F4 */ void Execute(f32 (**)[3][4]); - /* 80C16340 */ void Draw(); - /* 80C1641C */ void Delete(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C6B8 */ void getObjectResName2Index(char const*, char const*); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); -}; - -struct dBgW_Base {}; - -struct dBgW {}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80C16178 */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS_LinChk {}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); - /* 800743B4 */ void LineCross(cBgS_LinChk*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -217,21 +82,14 @@ extern "C" void cLib_chaseAngleS__FPsss(); extern "C" void cLib_offsetPos__FP4cXyzPC4cXyzsPC4cXyz(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -333,7 +191,8 @@ asm void daObjH_Saku_c::BreakSet() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_h_saku/d_a_obj_h_saku/__dt__4cXyzFv.s" } @@ -481,25 +340,30 @@ SECTION_DEAD static char const* const stringBase_80C16527 = "H_Saku.dzb"; SECTION_DATA static void* l_arcName = (void*)&d_a_obj_h_saku__stringBase0; /* 80C16544-80C16564 -00001 0020+00 1/0 0/0 0/0 .data l_daObjH_Saku_Method */ -SECTION_DATA static void* l_daObjH_Saku_Method[8] = { - (void*)daObjH_Saku_Create__FP10fopAc_ac_c, - (void*)daObjH_Saku_Delete__FP13daObjH_Saku_c, - (void*)daObjH_Saku_Execute__FP13daObjH_Saku_c, - (void*)daObjH_Saku_IsDelete__FP13daObjH_Saku_c, - (void*)daObjH_Saku_Draw__FP13daObjH_Saku_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjH_Saku_Method = { + (process_method_func)daObjH_Saku_Create__FP10fopAc_ac_c, + (process_method_func)daObjH_Saku_Delete__FP13daObjH_Saku_c, + (process_method_func)daObjH_Saku_Execute__FP13daObjH_Saku_c, + (process_method_func)daObjH_Saku_IsDelete__FP13daObjH_Saku_c, + (process_method_func)daObjH_Saku_Draw__FP13daObjH_Saku_c, }; /* 80C16564-80C16594 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_H_Saku */ -SECTION_DATA extern void* g_profile_Obj_H_Saku[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x014C0000, (void*)&g_fpcLf_Method, - (void*)0x00000850, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01D00000, (void*)&l_daObjH_Saku_Method, - (void*)0x00040180, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_H_Saku = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_H_Saku, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjH_Saku_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 464, // mPriority + &l_daObjH_Saku_Method, // sub_method + 0x00040180, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C16594-80C165B8 000054 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ @@ -544,7 +408,8 @@ static asm void daObjH_Saku_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_h_saku/d_a_obj_h_saku/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.cpp b/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.cpp index af74d650c68..bf908414e26 100644 --- a/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.cpp +++ b/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.cpp @@ -1,150 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_hakai_brl -// +/** + * @file d_a_obj_hakai_brl.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjHBarrel_c { - /* 80C16758 */ daObjHBarrel_c(); - /* 80C16918 */ ~daObjHBarrel_c(); - /* 80C16A98 */ void createHeap(); - /* 80C16B08 */ void create(); - /* 80C16BF8 */ void Delete(); - /* 80C16C44 */ void draw(); - /* 80C16CA8 */ void execute(); - /* 80C16D50 */ void init(); - /* 80C16DEC */ void setModelMtx(); - /* 80C16E50 */ void hitAction(); - /* 80C17090 */ void callEmt(); - - static u8 const s_CcDCyl[68]; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct JPABaseEmitter {}; - -struct dPa_modelEcallBack { - /* 8004AC00 */ void setModel(JPABaseEmitter*, J3DModelData*, dKy_tevstr_c const&, u8, void*, u8, - u8); - - static u8 mEcallback[4]; -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32); - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80C168BC */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 800844F8 */ void GetTgHitObj(); - /* 8008457C */ void GetTgHitObjSe(); - /* 800845B0 */ void getHitSeID(u8, int); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80C1682C */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80C16874 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80C172AC */ ~cCcD_GStts(); -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDF48 */ ~Z2SoundObjBase(); - /* 802BDFF8 */ void deleteObject(); - /* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -217,12 +78,8 @@ extern "C" void deleteObject__14Z2SoundObjBaseFv(); extern "C" void startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase(); extern "C" void __ct__16Z2SoundObjSimpleFv(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void _savegpr_27(); extern "C" void _restgpr_27(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -231,7 +88,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" extern void* __vt__16Z2SoundObjSimple[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 mEcallback__18dPa_modelEcallBack[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -260,25 +116,30 @@ SECTION_DEAD static char const* const stringBase_80C1735C = "HBarrel"; SECTION_DATA static void* l_arcName = (void*)&d_a_obj_hakai_brl__stringBase0; /* 80C17380-80C173A0 -00001 0020+00 1/0 0/0 0/0 .data daObjHBarrel_METHODS */ -SECTION_DATA static void* daObjHBarrel_METHODS[8] = { - (void*)daObjHBarrel_create__FP14daObjHBarrel_c, - (void*)daObjHBarrel_Delete__FP14daObjHBarrel_c, - (void*)daObjHBarrel_execute__FP14daObjHBarrel_c, - (void*)NULL, - (void*)daObjHBarrel_draw__FP14daObjHBarrel_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjHBarrel_METHODS = { + (process_method_func)daObjHBarrel_create__FP14daObjHBarrel_c, + (process_method_func)daObjHBarrel_Delete__FP14daObjHBarrel_c, + (process_method_func)daObjHBarrel_execute__FP14daObjHBarrel_c, + 0, + (process_method_func)daObjHBarrel_draw__FP14daObjHBarrel_c, }; /* 80C173A0-80C173D0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_HBarrel */ -SECTION_DATA extern void* g_profile_Obj_HBarrel[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01A30000, (void*)&g_fpcLf_Method, - (void*)0x00000710, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02E90000, (void*)&daObjHBarrel_METHODS, - (void*)0x00040180, (void*)0x030E0000, +extern actor_process_profile_definition g_profile_Obj_HBarrel = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_HBarrel, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjHBarrel_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 745, // mPriority + &daObjHBarrel_METHODS, // sub_method + 0x00040180, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C173D0-80C173DC 000054 000C+00 2/2 0/0 0/0 .data __vt__14daObjHBarrel_c */ @@ -330,7 +191,8 @@ asm daObjHBarrel_c::daObjHBarrel_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl/__dt__8cM3dGCylFv.s" } @@ -340,7 +202,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl/__dt__8cM3dGAabFv.s" } @@ -350,7 +213,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl/__dt__10dCcD_GSttsFv.s" } @@ -566,7 +430,8 @@ static asm void daObjHBarrel_draw(daObjHBarrel_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr.cpp b/rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr.cpp index 023a50a6921..32fa6394b4b 100644 --- a/rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr.cpp +++ b/rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr.cpp @@ -1,152 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_hakai_ftr -// +/** + * @file d_a_obj_hakai_ftr.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjHFtr_c { - /* 80C174B8 */ daObjHFtr_c(); - /* 80C17778 */ ~daObjHFtr_c(); - /* 80C17874 */ void createHeap(); - /* 80C179B0 */ void create(); - /* 80C17AC0 */ void Delete(); - /* 80C17B30 */ void draw(); - /* 80C17BD4 */ void execute(); - /* 80C17CD0 */ void init(); - /* 80C17E10 */ void setModelMtx(); - /* 80C17E74 */ void chkHit(); - /* 80C17EDC */ void callEmt(); - - static u8 const s_CcDCyl[68]; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80C1771C */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); - /* 80C1753C */ ~dCcD_Cyl(); - /* 80C17608 */ dCcD_Cyl(); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80C1768C */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80C176D4 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80C18068 */ ~cCcD_GStts(); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -215,8 +74,6 @@ extern "C" void SetR__8cM3dGCylFf(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void _savegpr_20(); @@ -227,8 +84,6 @@ extern "C" void _restgpr_20(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -236,8 +91,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // @@ -271,25 +124,30 @@ SECTION_DATA static void* l_arcName[3] = { }; /* 80C18188-80C181A8 -00001 0020+00 1/0 0/0 0/0 .data daObjHFtr_METHODS */ -SECTION_DATA static void* daObjHFtr_METHODS[8] = { - (void*)daObjHFtr_create__FP11daObjHFtr_c, - (void*)daObjHFtr_Delete__FP11daObjHFtr_c, - (void*)daObjHFtr_execute__FP11daObjHFtr_c, - (void*)NULL, - (void*)daObjHFtr_draw__FP11daObjHFtr_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjHFtr_METHODS = { + (process_method_func)daObjHFtr_create__FP11daObjHFtr_c, + (process_method_func)daObjHFtr_Delete__FP11daObjHFtr_c, + (process_method_func)daObjHFtr_execute__FP11daObjHFtr_c, + 0, + (process_method_func)daObjHFtr_draw__FP11daObjHFtr_c, }; /* 80C181A8-80C181D8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_HFtr */ -SECTION_DATA extern void* g_profile_Obj_HFtr[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01A20000, (void*)&g_fpcLf_Method, - (void*)0x00000860, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02E80000, (void*)&daObjHFtr_METHODS, - (void*)0x00040180, (void*)0x030E0000, +extern actor_process_profile_definition g_profile_Obj_HFtr = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_HFtr, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjHFtr_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 744, // mPriority + &daObjHFtr_METHODS, // sub_method + 0x00040180, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C181D8-80C181E4 00005C 000C+00 2/2 0/0 0/0 .data __vt__11daObjHFtr_c */ @@ -342,7 +200,8 @@ SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Cyl::~dCcD_Cyl() { +// asm dCcD_Cyl::~dCcD_Cyl() { +extern "C" asm void __dt__8dCcD_CylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr/__dt__8dCcD_CylFv.s" } @@ -352,7 +211,8 @@ asm dCcD_Cyl::~dCcD_Cyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Cyl::dCcD_Cyl() { +// asm dCcD_Cyl::dCcD_Cyl() { +extern "C" asm void __ct__8dCcD_CylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr/__ct__8dCcD_CylFv.s" } @@ -362,7 +222,8 @@ asm dCcD_Cyl::dCcD_Cyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr/__dt__8cM3dGCylFv.s" } @@ -372,7 +233,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr/__dt__8cM3dGAabFv.s" } @@ -382,7 +244,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr/__dt__10dCcD_GSttsFv.s" } @@ -622,7 +485,8 @@ static asm void daObjHFtr_draw(daObjHFtr_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_hasu2/d_a_obj_hasu2.cpp b/rel/d/a/obj/d_a_obj_hasu2/d_a_obj_hasu2.cpp index 2fc39276abe..e206e35a2d5 100644 --- a/rel/d/a/obj/d_a_obj_hasu2/d_a_obj_hasu2.cpp +++ b/rel/d/a/obj/d_a_obj_hasu2/d_a_obj_hasu2.cpp @@ -1,92 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_hasu2 -// +/** + * @file d_a_obj_hasu2.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_hasu2/d_a_obj_hasu2.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct nObjMHasu { - struct daObjMHasu_c { - /* 80C182DC */ daObjMHasu_c(); - /* 80C18340 */ void create1st(); - /* 80C183D0 */ void setMtx(); - /* 80C18440 */ void CreateHeap(); - /* 80C184B0 */ void Create(); - /* 80C185A4 */ void Execute(f32 (**)[3][4]); - /* 80C18600 */ void Draw(); - /* 80C186A4 */ void Delete(); - /* 80C186E0 */ void upDownHasu(); - /* 80C18888 */ void updateCount(u8); - /* 80C188A0 */ void setHasuCount(f32); - /* 80C189E0 */ ~daObjMHasu_c(); - }; -}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; - // // Forward References: // @@ -138,16 +57,10 @@ extern "C" void cM_rndF__Ff(); extern "C" void cLib_addCalc__FPfffff(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __cvt_fp2unsigned(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // @@ -204,25 +117,30 @@ SECTION_DEAD static char const* const stringBase_80C18AA0 = "M_Hasu"; SECTION_DATA static void* l_arcName = (void*)&d_a_obj_hasu2__stringBase0; /* 80C18AAC-80C18ACC -00001 0020+00 1/0 0/0 0/0 .data daObjMHasu_METHODS */ -SECTION_DATA static void* daObjMHasu_METHODS[8] = { - (void*)daObjMHasu_create1st__FPQ29nObjMHasu12daObjMHasu_c, - (void*)daObjMHasu_MoveBGDelete__FPQ29nObjMHasu12daObjMHasu_c, - (void*)daObjMHasu_MoveBGExecute__FPQ29nObjMHasu12daObjMHasu_c, - (void*)NULL, - (void*)daObjMHasu_MoveBGDraw__FPQ29nObjMHasu12daObjMHasu_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjMHasu_METHODS = { + (process_method_func)daObjMHasu_create1st__FPQ29nObjMHasu12daObjMHasu_c, + (process_method_func)daObjMHasu_MoveBGDelete__FPQ29nObjMHasu12daObjMHasu_c, + (process_method_func)daObjMHasu_MoveBGExecute__FPQ29nObjMHasu12daObjMHasu_c, + 0, + (process_method_func)daObjMHasu_MoveBGDraw__FPQ29nObjMHasu12daObjMHasu_c, }; /* 80C18ACC-80C18AFC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_MHasu */ -SECTION_DATA extern void* g_profile_Obj_MHasu[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00CB0000, (void*)&g_fpcLf_Method, - (void*)0x00000634, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x029A0000, (void*)&daObjMHasu_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_MHasu = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_MHasu, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(nObjMHasu::daObjMHasu_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 666, // mPriority + &daObjMHasu_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C18AFC-80C18B28 000054 002C+00 2/2 0/0 0/0 .data __vt__Q29nObjMHasu12daObjMHasu_c */ diff --git a/rel/d/a/obj/d_a_obj_hb/d_a_obj_hb.cpp b/rel/d/a/obj/d_a_obj_hb/d_a_obj_hb.cpp index 3e36b92115e..86aa12990d9 100644 --- a/rel/d/a/obj/d_a_obj_hb/d_a_obj_hb.cpp +++ b/rel/d/a/obj/d_a_obj_hb/d_a_obj_hb.cpp @@ -1,142 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_hb -// +/** + * @file d_a_obj_hb.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_hb/d_a_obj_hb.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_hb_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoExt_McaMorf { - /* 800105C8 */ void play(Vec*, u32, s8); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dCcU_AtInfo {}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjGndChk_Spl { - /* 800777B0 */ dBgS_ObjGndChk_Spl(); - /* 80077848 */ ~dBgS_ObjGndChk_Spl(); -}; - -struct dBgS_ObjAcch { - /* 80C1B578 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); -}; - -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct dAttention_c { - /* 8007353C */ void LockonTarget(s32); - /* 800737E4 */ void LockonTruth(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_PolyInfo {}; - -struct cBgS_LinChk {}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); - /* 80267D0C */ void SetPos(Vec const*); -}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 800744A0 */ void GroundCross(cBgS_GndChk*); -}; - -struct _GXTexObj {}; - -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); - /* 802C06F4 */ void stopAnime(); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -242,8 +112,6 @@ extern "C" void __ct__10Z2CreatureFv(); extern "C" void init__10Z2CreatureFP3VecP3VecUcUc(); extern "C" void stopAnime__10Z2CreatureFv(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void _savegpr_24(); extern "C" void _savegpr_26(); extern "C" void _savegpr_27(); @@ -254,8 +122,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; @@ -264,7 +130,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u8 data_80C1B7E0[4]; @@ -855,25 +720,30 @@ static dCcD_SrcSph cc_sph_src = { }; /* 80C1B750-80C1B770 -00001 0020+00 1/0 0/0 0/0 .data l_daOBJ_HB_Method */ -SECTION_DATA static void* l_daOBJ_HB_Method[8] = { - (void*)daOBJ_HB_Create__FP10fopAc_ac_c, - (void*)daOBJ_HB_Delete__FP12obj_hb_class, - (void*)daOBJ_HB_Execute__FP12obj_hb_class, - (void*)daOBJ_HB_IsDelete__FP12obj_hb_class, - (void*)daOBJ_HB_Draw__FP12obj_hb_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daOBJ_HB_Method = { + (process_method_func)daOBJ_HB_Create__FP10fopAc_ac_c, + (process_method_func)daOBJ_HB_Delete__FP12obj_hb_class, + (process_method_func)daOBJ_HB_Execute__FP12obj_hb_class, + (process_method_func)daOBJ_HB_IsDelete__FP12obj_hb_class, + (process_method_func)daOBJ_HB_Draw__FP12obj_hb_class, }; /* 80C1B770-80C1B7A0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_HB */ -SECTION_DATA extern void* g_profile_OBJ_HB[12] = { - (void*)0xFFFFFFFD, (void*)0x0008FFFD, - (void*)0x02FE0000, (void*)&g_fpcLf_Method, - (void*)0x00000A8C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02C10000, (void*)&l_daOBJ_HB_Method, - (void*)0x00040100, (void*)NULL, +extern actor_process_profile_definition g_profile_OBJ_HB = { + fpcLy_CURRENT_e, // mLayerID + 8, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_HB, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(obj_hb_class), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 705, // mPriority + &l_daOBJ_HB_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_0_e, // cullType }; /* 80C1B7A0-80C1B7AC 000098 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGSph */ @@ -939,7 +809,8 @@ extern "C" asm void __dt__8cM3dGAabFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_hb/d_a_obj_hb/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya.cpp b/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya.cpp index 06143b9873b..3cc8351dc07 100644 --- a/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya.cpp +++ b/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya.cpp @@ -462,7 +462,7 @@ extern "C" asm void __dt__17dEvLib_callback_cFv() { /* 80C1C45C-80C1C464 000C5C 0008+00 2/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv */ -// bool dEvLib_callback_c::eventStart() { +// bool dEvLib_callback_c::eventStart()() { extern "C" bool eventStart__17dEvLib_callback_cFv() { return true; } @@ -501,25 +501,30 @@ static asm void func_80C1C5E8() { #pragma pop /* 80C1C910-80C1C930 -00001 0020+00 1/0 0/0 0/0 .data daObjHBombkoya_METHODS */ -SECTION_DATA static void* daObjHBombkoya_METHODS[8] = { - (void*)daObjHBombkoya_create1st__FP16daObjHBombkoya_c, - (void*)daObjHBombkoya_MoveBGDelete__FP16daObjHBombkoya_c, - (void*)daObjHBombkoya_MoveBGExecute__FP16daObjHBombkoya_c, - (void*)NULL, - (void*)daObjHBombkoya_MoveBGDraw__FP16daObjHBombkoya_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjHBombkoya_METHODS = { + (process_method_func)daObjHBombkoya_create1st__FP16daObjHBombkoya_c, + (process_method_func)daObjHBombkoya_MoveBGDelete__FP16daObjHBombkoya_c, + (process_method_func)daObjHBombkoya_MoveBGExecute__FP16daObjHBombkoya_c, + 0, + (process_method_func)daObjHBombkoya_MoveBGDraw__FP16daObjHBombkoya_c, }; /* 80C1C930-80C1C960 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_HBombkoya */ -SECTION_DATA extern void* g_profile_Obj_HBombkoya[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00D80000, (void*)&g_fpcLf_Method, - (void*)0x000007C0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02A30000, (void*)&daObjHBombkoya_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_HBombkoya = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_HBombkoya, // mProcName + &g_fpcLf_Method.mBase, // sub_method + 0x000007C0, // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 675, // mPriority + &daObjHBombkoya_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C1C960-80C1C96C 00022C 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */ diff --git a/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.cpp b/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.cpp index 5cf5414c65f..d5984fbcec2 100644 --- a/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.cpp +++ b/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.cpp @@ -1,92 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_hfuta -// +/** + * @file d_a_obj_hfuta.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjFuta_c { - /* 80C1DD8C */ void initBaseMtx(); - /* 80C1DDC8 */ void setBaseMtx(); - /* 80C1DE94 */ void Create(); - /* 80C1DF2C */ void CreateHeap(); - /* 80C1DF9C */ void create1st(); - /* 80C1E020 */ void Execute(f32 (**)[3][4]); - /* 80C1EB38 */ void mode_proc_call(); - /* 80C1EBDC */ void mode_wait(); - /* 80C1EC44 */ void mode_move(); - /* 80C1ECB4 */ void mode_end(); - /* 80C1ECC4 */ void Draw(); - /* 80C1ED68 */ void Delete(); -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz { - static f32 Zero[3]; -}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); - /* 80C1EAFC */ ~csXyz(); - - static u8 Zero[4]; -}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct J3DModel {}; // // Forward References: @@ -139,19 +58,13 @@ extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP extern "C" void __ct__5csXyzFsss(); extern "C" void cLib_addCalc__FPfffff(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" f32 Zero__4cXyz[3]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 Zero__5csXyz[4]; extern "C" void __register_global_object(); @@ -632,7 +545,8 @@ asm void daObjFuta_c::Execute(f32 (**param_0)[3][4]) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm csXyz::~csXyz() { +// asm csXyz::~csXyz() { +extern "C" asm void __dt__5csXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/__dt__5csXyzFv.s" } @@ -772,25 +686,30 @@ asm void daObjFuta_c::Delete() { /* ############################################################################################## */ /* 80C1EF10-80C1EF30 -00001 0020+00 1/0 0/0 0/0 .data daObjFuta_METHODS */ -SECTION_DATA static void* daObjFuta_METHODS[8] = { - (void*)daObjFuta_create1st__FP11daObjFuta_c, - (void*)daObjFuta_MoveBGDelete__FP11daObjFuta_c, - (void*)daObjFuta_MoveBGExecute__FP11daObjFuta_c, - (void*)NULL, - (void*)daObjFuta_MoveBGDraw__FP11daObjFuta_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjFuta_METHODS = { + (process_method_func)daObjFuta_create1st__FP11daObjFuta_c, + (process_method_func)daObjFuta_MoveBGDelete__FP11daObjFuta_c, + (process_method_func)daObjFuta_MoveBGExecute__FP11daObjFuta_c, + 0, + (process_method_func)daObjFuta_MoveBGDraw__FP11daObjFuta_c, }; /* 80C1EF30-80C1EF60 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Hfuta */ -SECTION_DATA extern void* g_profile_Obj_Hfuta[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00610000, (void*)&g_fpcLf_Method, - (void*)0x000005CC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01C20000, (void*)&daObjFuta_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Hfuta = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Hfuta, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjFuta_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 450, // mPriority + &daObjFuta_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C1EF60-80C1EF88 0000BC 0028+00 1/1 0/0 0/0 .data __vt__11daObjFuta_c */ diff --git a/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.cpp b/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.cpp index 564cb3eb261..f78a5f56366 100644 --- a/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.cpp +++ b/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.cpp @@ -1,140 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_hhashi -// +/** + * @file d_a_obj_hhashi.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); - /* 805811BC */ csXyz(); - /* 8057FD6C */ ~csXyz(); -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjHHASHI_c { - /* 8057F9B8 */ void initCcCylinder(); - /* 8057FA18 */ void setCcCylinder(); - /* 8057FA90 */ void Set_Hahen(cXyz*); - /* 8057FDA8 */ void Set_Speed(s16, s16, f32, f32, f32, f32); - /* 805801B0 */ void Obj_Damage(); - /* 80580358 */ void Wall_Check(s16); - /* 8058043C */ void Hahen_Motion(s16); - /* 805805F4 */ void CheckCull(); - /* 805807C4 */ void checkViewArea(int); - /* 80580854 */ void Rolling(cXyz*, f32, f32, s8); - /* 80580A48 */ void Roll_Set(cXyz*, f32, s16); - /* 80580C80 */ void setBaseMtx(); - /* 80580DA4 */ void CreateHeap(); - /* 80580EA0 */ void create(); - /* 805811CC */ void Create(); - /* 80581210 */ void Execute(f32 (**)[3][4]); - /* 805812BC */ void Draw(); - /* 8058140C */ void Delete(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C6B8 */ void getObjectResName2Index(char const*, char const*); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct J3DModel {}; - -struct dComIfG_play_c { - /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); - /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); - /* 8002CB68 */ void entrySimpleModel(J3DModel*, int); -}; - -struct dBgW_Base {}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS_LinChk {}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); - /* 800743B4 */ void LineCross(cBgS_LinChk*); -}; - -struct Z2CreatureFM { - /* 802C2194 */ void startChainSound(JAISoundID, u8, f32, u32, s8); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; // // Forward References: @@ -232,8 +104,6 @@ extern "C" void cLib_targetAngleY__FPC3VecPC3Vec(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void startChainSound__12Z2CreatureFMF10JAISoundIDUcfUlSc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void __construct_array(); extern "C" void _savegpr_22(); extern "C" void _savegpr_25(); @@ -247,8 +117,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -256,8 +124,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -378,7 +244,8 @@ extern "C" asm void __dt__4cXyzFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm csXyz::~csXyz() { +// asm csXyz::~csXyz() { +extern "C" asm void __dt__5csXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/__dt__5csXyzFv.s" } @@ -775,25 +642,30 @@ SECTION_DEAD static char const* const stringBase_805815D3 = "L_hhashi00.dzb"; #pragma pop /* 805815E8-80581608 -00001 0020+00 1/0 0/0 0/0 .data l_daObjHHASHI_Method */ -SECTION_DATA static void* l_daObjHHASHI_Method[8] = { - (void*)daObjHHASHI_Create__FP10fopAc_ac_c, - (void*)daObjHHASHI_Delete__FP13daObjHHASHI_c, - (void*)daObjHHASHI_Execute__FP13daObjHHASHI_c, - (void*)daObjHHASHI_IsDelete__FP13daObjHHASHI_c, - (void*)daObjHHASHI_Draw__FP13daObjHHASHI_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjHHASHI_Method = { + (process_method_func)daObjHHASHI_Create__FP10fopAc_ac_c, + (process_method_func)daObjHHASHI_Delete__FP13daObjHHASHI_c, + (process_method_func)daObjHHASHI_Execute__FP13daObjHHASHI_c, + (process_method_func)daObjHHASHI_IsDelete__FP13daObjHHASHI_c, + (process_method_func)daObjHHASHI_Draw__FP13daObjHHASHI_c, }; /* 80581608-80581638 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_HHASHI */ -SECTION_DATA extern void* g_profile_Obj_HHASHI[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x006B0000, (void*)&g_fpcLf_Method, - (void*)0x0000119C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01CE0000, (void*)&l_daObjHHASHI_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_HHASHI = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_HHASHI, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjHHASHI_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 462, // mPriority + &l_daObjHHASHI_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80581638-80581644 000054 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ @@ -857,7 +729,8 @@ extern "C" asm void __dt__8cM3dGAabFv() { #pragma pop /* 805811BC-805811C0 00187C 0004+00 1/1 0/0 0/0 .text __ct__5csXyzFv */ -csXyz::csXyz() { +// csXyz::csXyz() { +extern "C" asm void __ct__5csXyzFv() { /* empty function */ } diff --git a/rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.cpp b/rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.cpp index 08f7da395f2..34d97d09c10 100644 --- a/rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.cpp +++ b/rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_ice_l -// +/** + * @file d_a_obj_ice_l.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.h" #include "SSystem/SComponent/c_math.h" @@ -396,25 +396,30 @@ SECTION_DEAD static char const* const stringBase_80C20824 = "Ice_l.dzb"; SECTION_DATA static char* l_arcName = "V_Ice_l"; /* 80C2083C-80C2085C -00001 0020+00 1/0 0/0 0/0 .data l_daObjIce_l_Method */ -SECTION_DATA static void* l_daObjIce_l_Method[8] = { - (void*)daObjIce_l_Create__FP10fopAc_ac_c, - (void*)daObjIce_l_Delete__FP12daObjIce_l_c, - (void*)daObjIce_l_Execute__FP12daObjIce_l_c, - (void*)daObjIce_l_IsDelete__FP12daObjIce_l_c, - (void*)daObjIce_l_Draw__FP12daObjIce_l_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjIce_l_Method = { + (process_method_func)daObjIce_l_Create__FP10fopAc_ac_c, + (process_method_func)daObjIce_l_Delete__FP12daObjIce_l_c, + (process_method_func)daObjIce_l_Execute__FP12daObjIce_l_c, + (process_method_func)daObjIce_l_IsDelete__FP12daObjIce_l_c, + (process_method_func)daObjIce_l_Draw__FP12daObjIce_l_c, }; /* 80C2085C-80C2088C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Ice_l */ -SECTION_DATA extern void* g_profile_Obj_Ice_l[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00660000, (void*)&g_fpcLf_Method, - (void*)0x00000640, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01C80000, (void*)&l_daObjIce_l_Method, - (void*)0x00044180, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Ice_l = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Ice_l, // mProcName + &g_fpcLf_Method.mBase, // sub_method + 0x00000640, // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 456, // mPriority + &l_daObjIce_l_Method, // sub_method + 0x00044180, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C2088C-80C208B4 000054 0028+00 1/1 0/0 0/0 .data __vt__12daObjIce_l_c */ diff --git a/rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.cpp b/rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.cpp index e6d1ec11ac2..4a6721d27e8 100644 --- a/rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.cpp +++ b/rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.cpp @@ -1,102 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_ice_s -// +/** + * @file d_a_obj_ice_s.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjIce_s_c { - /* 80C209DC */ void RideOn_Angle(s16&, f32, s16, f32); - /* 80C20A44 */ void Check_LinkRideOn(cXyz); - /* 80C20C98 */ void Check_RideOn(cXyz); - /* 80C20EC0 */ void initBaseMtx(); - /* 80C20EEC */ void setBaseMtx(); - /* 80C212CC */ void create(); - /* 80C2157C */ void CreateHeap(); - /* 80C215F4 */ void Create(); - /* 80C21634 */ void Execute(f32 (**)[3][4]); - /* 80C21964 */ void Draw(); - /* 80C21A08 */ void Delete(); -}; - -struct daOBJ_ICE_S_HIO_c { - /* 80C209AC */ daOBJ_ICE_S_HIO_c(); - /* 80C21A60 */ ~daOBJ_ICE_S_HIO_c(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C6B8 */ void getObjectResName2Index(char const*, char const*); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); -}; - -struct dBgW {}; - -struct dBgS_ObjGndChk_Spl { - /* 800777B0 */ dBgS_ObjGndChk_Spl(); - /* 80077848 */ ~dBgS_ObjGndChk_Spl(); -}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; -struct Vec {}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -162,24 +72,17 @@ extern "C" void cLib_chaseF__FPfff(); extern "C" void cLib_chaseAngleS__FPsss(); extern "C" void cLib_targetAngleY__FPC3VecPC3Vec(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSVECSquareDistance(); extern "C" void _savegpr_26(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" void __register_global_object(); // @@ -205,25 +108,30 @@ SECTION_DEAD static char const* const stringBase_80C21B8C = "V_Ice_s"; SECTION_DATA static void* l_arcName = (void*)&d_a_obj_ice_s__stringBase0; /* 80C21BAC-80C21BCC -00001 0020+00 1/0 0/0 0/0 .data l_daObjIce_s_Method */ -SECTION_DATA static void* l_daObjIce_s_Method[8] = { - (void*)daObjIce_s_Create__FP10fopAc_ac_c, - (void*)daObjIce_s_Delete__FP12daObjIce_s_c, - (void*)daObjIce_s_Execute__FP12daObjIce_s_c, - (void*)daObjIce_s_IsDelete__FP12daObjIce_s_c, - (void*)daObjIce_s_Draw__FP12daObjIce_s_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjIce_s_Method = { + (process_method_func)daObjIce_s_Create__FP10fopAc_ac_c, + (process_method_func)daObjIce_s_Delete__FP12daObjIce_s_c, + (process_method_func)daObjIce_s_Execute__FP12daObjIce_s_c, + (process_method_func)daObjIce_s_IsDelete__FP12daObjIce_s_c, + (process_method_func)daObjIce_s_Draw__FP12daObjIce_s_c, }; /* 80C21BCC-80C21BFC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Ice_s */ -SECTION_DATA extern void* g_profile_Obj_Ice_s[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00670000, (void*)&g_fpcLf_Method, - (void*)0x00000644, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01C90000, (void*)&l_daObjIce_s_Method, - (void*)0x00044180, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Ice_s = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Ice_s, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjIce_s_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 457, // mPriority + &l_daObjIce_s_Method, // sub_method + 0x00044180, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C21BFC-80C21C24 000054 0028+00 1/1 0/0 0/0 .data __vt__12daObjIce_s_c */ diff --git a/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.cpp b/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.cpp index 42fb2989889..bc137c14877 100644 --- a/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.cpp +++ b/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.cpp @@ -1,216 +1,15 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_iceblock -// +/** + * @file d_a_obj_iceblock.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" +#include "d/d_camera.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct dBgW_Base { - struct PushPullLabel {}; -}; - -struct daObjIceBlk_c { - /* 80C21CD8 */ void PPCallBack(fopAc_ac_c*, fopAc_ac_c*, s16, dBgW_Base::PushPullLabel); - /* 80C21DC4 */ void initBaseMtx(); - /* 80C21E24 */ void setBaseMtx(); - /* 80C21EA4 */ void getPointNo(); - /* 80C21F2C */ void loadCurrentPos(); - /* 80C21FC8 */ void saveCurrentPos(); - /* 80C22200 */ void enablePushPull(); - /* 80C2224C */ void disablePushPull(); - /* 80C22298 */ void Create(); - /* 80C22618 */ void CreateHeap(); - /* 80C227F4 */ void create1st(); - /* 80C228B4 */ void Execute(f32 (**)[3][4]); - /* 80C2294C */ void checkWalk(); - /* 80C22B04 */ void clrCounter(); - /* 80C22B28 */ void mode_proc_call(); - /* 80C22EF8 */ void mode_init_wait(); - /* 80C22F74 */ void mode_proc_wait(); - /* 80C23058 */ void mode_init_walk(); - /* 80C23088 */ void mode_proc_walk(); - /* 80C23388 */ void setEffect(); - /* 80C2350C */ void checkWallPre(s16); - /* 80C236C8 */ void checkBgHit(); - /* 80C237B0 */ void bgCheck(); - /* 80C23860 */ void init_bgCheck(); - /* 80C238B0 */ void checkFall(); - /* 80C23A50 */ void event_proc_call(); - /* 80C23B0C */ void actionWait(); - /* 80C23B70 */ void actionOrderEvent(); - /* 80C23C1C */ void actionEvent(); - /* 80C23CA0 */ void actionDead(); - /* 80C23CA4 */ void Draw(); - /* 80C23DA8 */ void Delete(); -}; - -struct J3DModel {}; - -struct daMirror_c { - /* 8003194C */ void entry(J3DModel*); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 800352B0 */ void offSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dCamera_c { - /* 801614AC */ void Start(); - /* 801614D0 */ void Stop(); - /* 8016300C */ void SetTrimSize(s32); -}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjLinChk { - /* 80077F5C */ dBgS_ObjLinChk(); - /* 80077FB8 */ ~dBgS_ObjLinChk(); -}; - -struct dBgS_ObjGndChk { - /* 80C23FCC */ ~dBgS_ObjGndChk(); -}; - -struct dBgS_ObjAcch { - /* 80C241A0 */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_LinChk { - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80C24130 */ ~dBgS_AcchCir(); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); - /* 80075B84 */ void RideCallBack(cBgS_PolyInfo const&, fopAc_ac_c*); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS_LinChk {}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 800744A0 */ void GroundCross(cBgS_GndChk*); - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; // // Forward References: @@ -355,8 +154,6 @@ extern "C" void cLib_chaseF__FPfff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_23(); extern "C" void _savegpr_25(); @@ -368,8 +165,6 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -377,9 +172,7 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 BaseZ__4cXyz[12]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 struct_80C24698[4]; @@ -1026,25 +819,30 @@ SECTION_DATA static u8 l_func_4704[48] = { #pragma pop /* 80C24584-80C245A4 -00001 0020+00 1/0 0/0 0/0 .data daObjIceBlk_METHODS */ -SECTION_DATA static void* daObjIceBlk_METHODS[8] = { - (void*)daObjIceBlk_create1st__FP13daObjIceBlk_c, - (void*)daObjIceBlk_MoveBGDelete__FP13daObjIceBlk_c, - (void*)daObjIceBlk_MoveBGExecute__FP13daObjIceBlk_c, - (void*)NULL, - (void*)daObjIceBlk_MoveBGDraw__FP13daObjIceBlk_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjIceBlk_METHODS = { + (process_method_func)daObjIceBlk_create1st__FP13daObjIceBlk_c, + (process_method_func)daObjIceBlk_MoveBGDelete__FP13daObjIceBlk_c, + (process_method_func)daObjIceBlk_MoveBGExecute__FP13daObjIceBlk_c, + 0, + (process_method_func)daObjIceBlk_MoveBGDraw__FP13daObjIceBlk_c, }; /* 80C245A4-80C245D4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_IceBlock */ -SECTION_DATA extern void* g_profile_Obj_IceBlock[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00DF0000, (void*)&g_fpcLf_Method, - (void*)0x000009EC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02170000, (void*)&daObjIceBlk_METHODS, - (void*)0x00040500, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_IceBlock = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_IceBlock, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjIceBlk_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 535, // mPriority + &daObjIceBlk_METHODS, // sub_method + 0x00040500, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C245D4-80C245E0 000104 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ @@ -1235,7 +1033,8 @@ static asm void daObjIceBlk_create1st(daObjIceBlk_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +// asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +extern "C" asm void __dt__14dBgS_ObjGndChkFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__14dBgS_ObjGndChkFv.s" } @@ -1278,7 +1077,8 @@ extern "C" asm void __dt__10dCcD_GSttsFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__12dBgS_AcchCirFv.s" } @@ -1288,7 +1088,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.cpp b/rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.cpp index 3b01c179e5a..490d1aaa5ab 100644 --- a/rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.cpp +++ b/rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.cpp @@ -1,158 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_iceleaf -// +/** + * @file d_a_obj_iceleaf.cpp + * +*/ -// #include "rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.h" +#include "rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CDD4 */ void transM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static u8 mGndCheck[84]; -}; - -struct daObjIceLeaf_c { - /* 80C24738 */ void initBaseMtx(); - /* 80C24774 */ void setBaseMtx(); - /* 80C249E4 */ void Create(); - /* 80C24BC4 */ void setAnmPos(); - /* 80C24C9C */ void CreateHeap(); - /* 80C24E14 */ void create(); - /* 80C25158 */ void execute(); - /* 80C25360 */ void action(); - /* 80C2541C */ void modeDropWait(); - /* 80C25614 */ void modeDrop(); - /* 80C258F8 */ void modePlayerWait(); - /* 80C25904 */ void modeRide(); - /* 80C25908 */ void event_proc_call(); - /* 80C259C4 */ void actionWait(); - /* 80C259C8 */ void actionOrderEvent(); - /* 80C25A68 */ void actionEvent(); - /* 80C25AC4 */ void actionDead(); - /* 80C25AC8 */ void setFallSE(); - /* 80C25BB8 */ void draw(); - /* 80C25C50 */ void _delete(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); - /* 8004D068 */ void setPoly(u16, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, int, dPa_levelEcallBack*, s8, cXyz const*); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dEvent_manager_c { - /* 80047698 */ void getEventIdx(fopAc_ac_c*, u8); - /* 80047A78 */ void endCheck(s16); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80C250E8 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80C25078 */ ~dBgS_AcchCir(); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80C24DCC */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -251,16 +105,11 @@ extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -270,7 +119,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" u8 mGndCheck__11fopAcM_gc_c[84]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 struct_80C25F98[4]; @@ -512,25 +360,30 @@ SECTION_DATA static u8 l_func_4107[48] = { #pragma pop /* 80C25ED8-80C25EF8 -00001 0020+00 1/0 0/0 0/0 .data l_daObjIceLeaf_Method */ -SECTION_DATA static void* l_daObjIceLeaf_Method[8] = { - (void*)daObjIceLeaf_Create__FP14daObjIceLeaf_c, - (void*)daObjIceLeaf_Delete__FP14daObjIceLeaf_c, - (void*)daObjIceLeaf_Execute__FP14daObjIceLeaf_c, - (void*)NULL, - (void*)daObjIceLeaf_Draw__FP14daObjIceLeaf_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjIceLeaf_Method = { + (process_method_func)daObjIceLeaf_Create__FP14daObjIceLeaf_c, + (process_method_func)daObjIceLeaf_Delete__FP14daObjIceLeaf_c, + (process_method_func)daObjIceLeaf_Execute__FP14daObjIceLeaf_c, + 0, + (process_method_func)daObjIceLeaf_Draw__FP14daObjIceLeaf_c, }; /* 80C25EF8-80C25F28 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_IceLeaf */ -SECTION_DATA extern void* g_profile_Obj_IceLeaf[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01870000, (void*)&g_fpcLf_Method, - (void*)0x0000097C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02370000, (void*)&l_daObjIceLeaf_Method, - (void*)0x00060000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_IceLeaf = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_IceLeaf, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjIceLeaf_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 567, // mPriority + &l_daObjIceLeaf_Method, // sub_method + 0x00060000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C25F28-80C25F34 000178 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ @@ -602,7 +455,8 @@ asm void daObjIceLeaf_c::CreateHeap() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf/__dt__12J3DFrameCtrlFv.s" } @@ -655,7 +509,8 @@ extern "C" asm void __dt__10dCcD_GSttsFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf/__dt__12dBgS_AcchCirFv.s" } @@ -665,7 +520,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_ihasi/d_a_obj_ihasi.cpp b/rel/d/a/obj/d_a_obj_ihasi/d_a_obj_ihasi.cpp index 528d12dec41..6399700defe 100644 --- a/rel/d/a/obj/d_a_obj_ihasi/d_a_obj_ihasi.cpp +++ b/rel/d/a/obj/d_a_obj_ihasi/d_a_obj_ihasi.cpp @@ -1,99 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_ihasi -// +/** + * @file d_a_obj_ihasi.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_ihasi/d_a_obj_ihasi.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_ihasi_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 8003498C */ void onEventBit(u16); - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct csXyz {}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS_PolyInfo {}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80C264F8 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -141,20 +53,13 @@ extern "C" void cM_rndF__Ff(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void strcmp(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; // // Declarations: @@ -248,25 +153,30 @@ SECTION_RODATA static f32 const lit_3922 = 1.0f; COMPILER_STRIP_GATE(0x80C26894, &lit_3922); /* 80C268D8-80C268F8 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Ihasi_Method */ -SECTION_DATA static void* l_daObj_Ihasi_Method[8] = { - (void*)daObj_Ihasi_Create__FP10fopAc_ac_c, - (void*)daObj_Ihasi_Delete__FP15obj_ihasi_class, - (void*)daObj_Ihasi_Execute__FP15obj_ihasi_class, - (void*)daObj_Ihasi_IsDelete__FP15obj_ihasi_class, - (void*)daObj_Ihasi_Draw__FP15obj_ihasi_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObj_Ihasi_Method = { + (process_method_func)daObj_Ihasi_Create__FP10fopAc_ac_c, + (process_method_func)daObj_Ihasi_Delete__FP15obj_ihasi_class, + (process_method_func)daObj_Ihasi_Execute__FP15obj_ihasi_class, + (process_method_func)daObj_Ihasi_IsDelete__FP15obj_ihasi_class, + (process_method_func)daObj_Ihasi_Draw__FP15obj_ihasi_class, }; /* 80C268F8-80C26928 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_IHASI */ -SECTION_DATA extern void* g_profile_OBJ_IHASI[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00DE0000, (void*)&g_fpcLf_Method, - (void*)0x000005C4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02150000, (void*)&l_daObj_Ihasi_Method, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_IHASI = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_IHASI, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(obj_ihasi_class), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 533, // mPriority + &l_daObj_Ihasi_Method, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C26928-80C26934 000050 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ @@ -290,7 +200,8 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ihasi/d_a_obj_ihasi/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_ikada/d_a_obj_ikada.cpp b/rel/d/a/obj/d_a_obj_ikada/d_a_obj_ikada.cpp index 8987e89d822..f8ece5a784c 100644 --- a/rel/d/a/obj/d_a_obj_ikada/d_a_obj_ikada.cpp +++ b/rel/d/a/obj/d_a_obj_ikada/d_a_obj_ikada.cpp @@ -1,114 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_ikada -// +/** + * @file d_a_obj_ikada.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_ikada/d_a_obj_ikada.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct fopAcM_wt_c { - /* 8001DD84 */ void waterCheck(cXyz const*); - - static f32 mWaterY[1 + 1 /* padding */]; -}; - -struct daObjIkada_c { - /* 80C269B8 */ void RideOn_Angle(s16&, f32, s16, f32); - /* 80C26A20 */ void Check_RideOn(); - /* 80C26C50 */ void initBaseMtx(); - /* 80C26C7C */ void setBaseMtx(); - /* 80C27028 */ void CreateHeap(); - /* 80C270A0 */ void Create(); - /* 80C270E0 */ void Execute(f32 (**)[3][4]); - /* 80C27400 */ void Draw(); - /* 80C274A4 */ void Delete(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C6B8 */ void getObjectResName2Index(char const*, char const*); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); -}; - -struct dBgW {}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80C26FB8 */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); -}; - -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct Vec {}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -173,22 +70,15 @@ extern "C" void cLib_addCalc__FPfffff(); extern "C" void cLib_addCalcAngleS__FPsssss(); extern "C" void cLib_targetAngleY__FPC3VecPC3Vec(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSVECSquareDistance(); extern "C" void _savegpr_26(); extern "C" void _savegpr_29(); extern "C" void _restgpr_26(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; // @@ -424,25 +314,30 @@ SECTION_DEAD static char const* const stringBase_80C2756C = "M_Ikada.dzb"; SECTION_DATA static void* l_arcName = (void*)&d_a_obj_ikada__stringBase0; /* 80C27588-80C275A8 -00001 0020+00 1/0 0/0 0/0 .data l_daObjIkada_Method */ -SECTION_DATA static void* l_daObjIkada_Method[8] = { - (void*)daObjIkada_Create__FP10fopAc_ac_c, - (void*)daObjIkada_Delete__FP12daObjIkada_c, - (void*)daObjIkada_Execute__FP12daObjIkada_c, - (void*)daObjIkada_IsDelete__FP12daObjIkada_c, - (void*)daObjIkada_Draw__FP12daObjIkada_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjIkada_Method = { + (process_method_func)daObjIkada_Create__FP10fopAc_ac_c, + (process_method_func)daObjIkada_Delete__FP12daObjIkada_c, + (process_method_func)daObjIkada_Execute__FP12daObjIkada_c, + (process_method_func)daObjIkada_IsDelete__FP12daObjIkada_c, + (process_method_func)daObjIkada_Draw__FP12daObjIkada_c, }; /* 80C275A8-80C275D8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Ikada */ -SECTION_DATA extern void* g_profile_Obj_Ikada[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00650000, (void*)&g_fpcLf_Method, - (void*)0x00000844, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01C70000, (void*)&l_daObjIkada_Method, - (void*)0x00040180, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Ikada = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Ikada, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjIkada_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 455, // mPriority + &l_daObjIkada_Method, // sub_method + 0x00040180, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C275D8-80C275FC 000054 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ @@ -487,7 +382,8 @@ static asm void daObjIkada_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ikada/d_a_obj_ikada/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_inobone/d_a_obj_inobone.cpp b/rel/d/a/obj/d_a_obj_inobone/d_a_obj_inobone.cpp index 2886f21536d..0349ea7414d 100644 --- a/rel/d/a/obj/d_a_obj_inobone/d_a_obj_inobone.cpp +++ b/rel/d/a/obj/d_a_obj_inobone/d_a_obj_inobone.cpp @@ -1,94 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_inobone -// +/** + * @file d_a_obj_inobone.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_inobone/d_a_obj_inobone.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObjIBone_c { - /* 80C27830 */ void initBaseMtx(); - /* 80C2786C */ void setBaseMtx(); - /* 80C278CC */ void Create(); - /* 80C279A8 */ void CreateHeap(); - /* 80C27A20 */ void create(); - /* 80C27C4C */ void execute(); - /* 80C27E48 */ void setBreakEffect(); - /* 80C27FEC */ void draw(); - /* 80C28050 */ void _delete(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct JPABaseEmitter {}; - -struct dPa_modelEcallBack { - /* 8004AC00 */ void setModel(JPABaseEmitter*, J3DModelData*, dKy_tevstr_c const&, u8, void*, u8, - u8); - - static u8 mEcallback[4]; -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDFF8 */ void deleteObject(); - /* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*); -}; - -struct J3DModel {}; // // Forward References: @@ -159,15 +77,12 @@ extern "C" void deleteObject__14Z2SoundObjBaseFv(); extern "C" void startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase(); extern "C" void __ct__16Z2SoundObjSimpleFv(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); extern "C" void _savegpr_26(); extern "C" void _savegpr_27(); extern "C" void _savegpr_29(); extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -175,7 +90,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 mEcallback__18dPa_modelEcallBack[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -333,25 +247,30 @@ asm void daObjIBone_c::CreateHeap() { /* ############################################################################################## */ /* 80C28200-80C28220 -00001 0020+00 1/0 0/0 0/0 .data l_daObjIBone_Method */ -SECTION_DATA static void* l_daObjIBone_Method[8] = { - (void*)daObjIBone_Create__FP10fopAc_ac_c, - (void*)daObjIBone_Delete__FP12daObjIBone_c, - (void*)daObjIBone_Execute__FP12daObjIBone_c, - (void*)NULL, - (void*)daObjIBone_Draw__FP12daObjIBone_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjIBone_Method = { + (process_method_func)daObjIBone_Create__FP10fopAc_ac_c, + (process_method_func)daObjIBone_Delete__FP12daObjIBone_c, + (process_method_func)daObjIBone_Execute__FP12daObjIBone_c, + 0, + (process_method_func)daObjIBone_Draw__FP12daObjIBone_c, }; /* 80C28220-80C28250 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_InoBone */ -SECTION_DATA extern void* g_profile_Obj_InoBone[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x015F0000, (void*)&g_fpcLf_Method, - (void*)0x0000084C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02D90000, (void*)&l_daObjIBone_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_InoBone = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_InoBone, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjIBone_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 729, // mPriority + &l_daObjIBone_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C28250-80C2825C 000058 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ diff --git a/rel/d/a/obj/d_a_obj_ita/d_a_obj_ita.cpp b/rel/d/a/obj/d_a_obj_ita/d_a_obj_ita.cpp index 75d202dd46b..9f06972aca3 100644 --- a/rel/d/a/obj/d_a_obj_ita/d_a_obj_ita.cpp +++ b/rel/d/a/obj/d_a_obj_ita/d_a_obj_ita.cpp @@ -1,150 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_ita -// +/** + * @file d_a_obj_ita.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_ita/d_a_obj_ita.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct fopAcM_wt_c { - /* 8001DD84 */ void waterCheck(cXyz const*); - - static f32 mWaterY[1 + 1 /* padding */]; -}; - -struct daObj_ITA_HIO_c { - /* 80C2836C */ daObj_ITA_HIO_c(); - /* 80C29184 */ ~daObj_ITA_HIO_c(); -}; - -struct daObjIta_c { - /* 80C283AC */ void Search_Ymb(); - /* 80C28674 */ void Check_RideOn(); - /* 80C28788 */ void initBaseMtx(); - /* 80C287B4 */ void setBaseMtx(); - /* 80C28928 */ void create(); - /* 80C28BB0 */ void CreateHeap(); - /* 80C28C28 */ void Create(); - /* 80C28C70 */ void Execute(f32 (**)[3][4]); - /* 80C290AC */ void Draw(); - /* 80C29150 */ void Delete(); -}; - -struct daE_YMB_c { - /* 808172F8 */ void setHitBoardSe(); -}; - -struct dVibration_c { - /* 8006FC0C */ void StartQuake(u8 const*, int, int, cXyz); - /* 8006FD94 */ void StopQuake(int); -}; -struct dKy_tevstr_c {}; -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C6B8 */ void getObjectResName2Index(char const*, char const*); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); -}; - -struct dBgW {}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80C28B40 */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); -}; - -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - template - struct TSinCosTable {}; - /* TSinCosTable<13, f32> */ - struct TSinCosTable__template0 { - /* 80C291CC */ void func_80C291CC(void* _this, s16) /* const */; - }; - - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -223,20 +86,14 @@ extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __ct__10Z2CreatureFv(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -283,25 +140,30 @@ SECTION_DEAD static char const* const stringBase_80C292E8 = "M_Ita"; SECTION_DATA static void* l_arcName = (void*)&d_a_obj_ita__stringBase0; /* 80C2931C-80C2933C -00001 0020+00 1/0 0/0 0/0 .data l_daObjIta_Method */ -SECTION_DATA static void* l_daObjIta_Method[8] = { - (void*)daObjIta_Create__FP10fopAc_ac_c, - (void*)daObjIta_Delete__FP10daObjIta_c, - (void*)daObjIta_Execute__FP10daObjIta_c, - (void*)daObjIta_IsDelete__FP10daObjIta_c, - (void*)daObjIta_Draw__FP10daObjIta_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjIta_Method = { + (process_method_func)daObjIta_Create__FP10fopAc_ac_c, + (process_method_func)daObjIta_Delete__FP10daObjIta_c, + (process_method_func)daObjIta_Execute__FP10daObjIta_c, + (process_method_func)daObjIta_IsDelete__FP10daObjIta_c, + (process_method_func)daObjIta_Draw__FP10daObjIta_c, }; /* 80C2933C-80C2936C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_ITA */ -SECTION_DATA extern void* g_profile_Obj_ITA[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00770000, (void*)&g_fpcLf_Method, - (void*)0x000008DC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01DA0000, (void*)&l_daObjIta_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_ITA = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_ITA, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjIta_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 474, // mPriority + &l_daObjIta_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C2936C-80C29390 000054 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ @@ -680,7 +542,8 @@ asm void daObjIta_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ita/d_a_obj_ita/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato.cpp b/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato.cpp index a1c7df23ea8..92c536c66a4 100644 --- a/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato.cpp +++ b/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato.cpp @@ -1,164 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_itamato -// +/** + * @file d_a_obj_itamato.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; -struct csXyz { - /* 80C296E0 */ ~csXyz(); - /* 80C29AC0 */ csXyz(); -}; - -struct mDoMtx_stack_c { - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObj_ItaMato_c { - /* 80C294EC */ ~daObj_ItaMato_c(); - /* 80C2971C */ void create(); - /* 80C29CD8 */ void CreateHeap(); - /* 80C29DAC */ void Delete(); - /* 80C29DE0 */ void Execute(); - /* 80C2A44C */ void Draw(); - /* 80C2A5D0 */ void createHeapCallBack(fopAc_ac_c*); - /* 80C2A5F0 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); - /* 80C2A620 */ void getResName(); - /* 80C2A630 */ void setSwayParam(fopAc_ac_c*); - /* 80C2A7C4 */ void setPrtcls(); - /* 80C2A890 */ void setEnvTevColor(); - /* 80C2A8EC */ void setRoomNo(); - /* 80C2A930 */ void setMtx(); -}; - -struct daObj_ItaMato_Param_c { - /* 80C2AB04 */ ~daObj_ItaMato_Param_c(); - - static u8 const m[20]; -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dSv_event_c { - /* 800349E0 */ void setEventReg(u16, u8); - /* 80034A04 */ void getEventReg(u16) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B8B4 */ void forceOnEventMove(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80C29C68 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80C29B9C */ ~dBgS_AcchCir(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct dBgS { - /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct dAttention_c { - /* 80070844 */ void GetLockonList(s32); - /* 800737E4 */ void LockonTruth(); -}; - -struct dAttList_c { - /* 80073864 */ void getActor(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_GndChk { - /* 80267C1C */ cBgS_GndChk(); - /* 80267C94 */ ~cBgS_GndChk(); -}; - -struct _GXTexObj {}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -266,9 +115,6 @@ extern "C" void SetR__8cM3dGSphFf(); extern "C" void cLib_addCalc2__FPffff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void _savegpr_24(); @@ -279,8 +125,6 @@ extern "C" void _restgpr_24(); extern "C" void _restgpr_25(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; @@ -289,7 +133,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -323,25 +166,30 @@ static dCcD_SrcSph l_ccDSph = { SECTION_DATA static void* l_resName = (void*)&d_a_obj_itamato__stringBase0; /* 80C2AC78-80C2AC98 -00001 0020+00 1/0 0/0 0/0 .data daObj_ItaMato_MethodTable */ -SECTION_DATA static void* daObj_ItaMato_MethodTable[8] = { - (void*)daObj_ItaMato_Create__FPv, - (void*)daObj_ItaMato_Delete__FPv, - (void*)daObj_ItaMato_Execute__FPv, - (void*)daObj_ItaMato_IsDelete__FPv, - (void*)daObj_ItaMato_Draw__FPv, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObj_ItaMato_MethodTable = { + (process_method_func)daObj_ItaMato_Create__FPv, + (process_method_func)daObj_ItaMato_Delete__FPv, + (process_method_func)daObj_ItaMato_Execute__FPv, + (process_method_func)daObj_ItaMato_IsDelete__FPv, + (process_method_func)daObj_ItaMato_Draw__FPv, }; /* 80C2AC98-80C2ACC8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_ITAMATO */ -SECTION_DATA extern void* g_profile_OBJ_ITAMATO[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x012E0000, (void*)&g_fpcLf_Method, - (void*)0x00000A20, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00530000, (void*)&daObj_ItaMato_MethodTable, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_ITAMATO = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_ITAMATO, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObj_ItaMato_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 83, // mPriority + &daObj_ItaMato_MethodTable, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C2ACC8-80C2ACEC 000094 0024+00 3/3 0/0 0/0 .data __vt__12dBgS_ObjAcch */ @@ -420,7 +268,8 @@ asm daObj_ItaMato_c::~daObj_ItaMato_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm csXyz::~csXyz() { +// asm csXyz::~csXyz() { +extern "C" asm void __dt__5csXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato/__dt__5csXyzFv.s" } @@ -487,7 +336,8 @@ asm void daObj_ItaMato_c::create() { #pragma pop /* 80C29AC0-80C29AC4 0006C0 0004+00 1/1 0/0 0/0 .text __ct__5csXyzFv */ -csXyz::csXyz() { +// csXyz::csXyz() { +extern "C" asm void __ct__5csXyzFv() { /* empty function */ } @@ -528,7 +378,8 @@ extern "C" asm void __dt__8cM3dGAabFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato/__dt__12dBgS_AcchCirFv.s" } @@ -549,7 +400,8 @@ extern "C" asm void __dt__10dCcD_GSttsFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_ito/d_a_obj_ito.cpp b/rel/d/a/obj/d_a_obj_ito/d_a_obj_ito.cpp index d229f9d951f..3cf4e234ac7 100644 --- a/rel/d/a/obj/d_a_obj_ito/d_a_obj_ito.cpp +++ b/rel/d/a/obj/d_a_obj_ito/d_a_obj_ito.cpp @@ -1,113 +1,14 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_ito -// +/** + * @file d_a_obj_ito.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_ito/d_a_obj_ito.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_ito_class {}; - -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoExt_3DlineMat_c {}; - -struct mDoExt_3DlineMatSortPacket { - /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); -}; - -struct dKy_tevstr_c {}; -struct _GXColor {}; -struct mDoExt_3DlineMat0_c { - /* 800125E0 */ void init(u16, u16, int); - /* 80012E3C */ void update(int, _GXColor&, dKy_tevstr_c*); -}; - -struct ito_s {}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObj_Ito_HIO_c { - /* 8047B2EC */ daObj_Ito_HIO_c(); - /* 8047D778 */ ~daObj_Ito_HIO_c(); -}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct dPa_control_c { - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dCcU_AtInfo {}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_LinChk {}; - -struct cBgS_GndChk { - /* 80267D0C */ void SetPos(Vec const*); -}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 800744A0 */ void GroundCross(cBgS_GndChk*); -}; - -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -200,8 +101,6 @@ extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __ct__10Z2CreatureFv(); extern "C" void init__10Z2CreatureFP3VecP3VecUcUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __construct_array(); extern "C" void _savegpr_14(); extern "C" void _savegpr_16(); @@ -216,8 +115,6 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); extern "C" extern void* __vt__19mDoExt_3DlineMat0_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; @@ -225,7 +122,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -264,25 +160,30 @@ SECTION_DATA static u8 obj_size[28] = { }; /* 8047D938-8047D958 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Ito_Method */ -SECTION_DATA static void* l_daObj_Ito_Method[8] = { - (void*)daObj_Ito_Create__FP10fopAc_ac_c, - (void*)daObj_Ito_Delete__FP13obj_ito_class, - (void*)daObj_Ito_Execute__FP13obj_ito_class, - (void*)daObj_Ito_IsDelete__FP13obj_ito_class, - (void*)daObj_Ito_Draw__FP13obj_ito_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObj_Ito_Method = { + (process_method_func)daObj_Ito_Create__FP10fopAc_ac_c, + (process_method_func)daObj_Ito_Delete__FP13obj_ito_class, + (process_method_func)daObj_Ito_Execute__FP13obj_ito_class, + (process_method_func)daObj_Ito_IsDelete__FP13obj_ito_class, + (process_method_func)daObj_Ito_Draw__FP13obj_ito_class, }; /* 8047D958-8047D988 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_ITO */ -SECTION_DATA extern void* g_profile_OBJ_ITO[12] = { - (void*)0xFFFFFFFD, (void*)0x0004FFFD, - (void*)0x00F00000, (void*)&g_fpcLf_Method, - (void*)0x0000150C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x003D0000, (void*)&l_daObj_Ito_Method, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_ITO = { + fpcLy_CURRENT_e, // mLayerID + 4, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_ITO, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(obj_ito_class), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 61, // mPriority + &l_daObj_Ito_Method, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 8047D988-8047D994 0000AC 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */ diff --git a/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.cpp b/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.cpp index 807736a4c5a..3467fca928d 100644 --- a/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.cpp +++ b/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.cpp @@ -1,243 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_kag -// +/** + * @file d_a_obj_kag.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CF0C */ void ZXYrotS(csXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct Vec {}; -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; - -struct mDoExt_McaMorfSO { - /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, - int, Z2Creature*, u32, u32); - /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32); - /* 800110B0 */ void play(u32, s8); - /* 800111C0 */ void entryDL(); - /* 800111EC */ void modelCalc(); - /* 80011310 */ void stopZelAnime(); -}; - -struct fopAc_ac_c {}; - -struct daPy_boomerangMove_c { - /* 8015E5B0 */ void initOffset(cXyz const*); - /* 8015E654 */ void posMove(cXyz*, s16*, fopAc_ac_c*, s16); - /* 8015E87C */ void bgCheckAfterOffset(cXyz const*); -}; - -struct daObj_KagHIO_c { - /* 80C2E40C */ daObj_KagHIO_c(); - /* 80C31060 */ ~daObj_KagHIO_c(); -}; - -struct daObjKAG_c { - /* 80C2E434 */ void setAction(void (daObjKAG_c::*)()); - /* 80C2E7A0 */ void Kag_Bgcheck(cXyz*, csXyz*, cXyz*); - /* 80C2EA40 */ void fly(); - /* 80C2F764 */ void wait(); - /* 80C2F8C4 */ void walk(); - /* 80C2FD94 */ void bin_wait(); - /* 80C2FF10 */ void bin_action(); - /* 80C30070 */ void hook(); - /* 80C30274 */ void boomerang(); - /* 80C303C4 */ void action(); - /* 80C30424 */ void checkGroundPos(); - /* 80C30498 */ void hit_check(); - /* 80C3054C */ void execute(); - /* 80C306EC */ void _delete(); - /* 80C30754 */ void setBaseMtx(); - /* 80C308F0 */ void create(); - /* 80C30E54 */ void kag_setParticle(); -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dMenu_Insect_c { - /* 801D9F3C */ void isCatchNotGiveInsect(u8); -}; - -struct dInsect_c { - /* 8015E010 */ dInsect_c(); - /* 8015E078 */ void Insect_GetDemoMain(); - /* 8015E26C */ void CalcZBuffer(f32); - /* 80C310E4 */ void Insect_Release(); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcSph {}; - -struct dCcD_Sph { - /* 80084A34 */ void Set(dCcD_SrcSph const&); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); - /* 80C30DF0 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 800844F8 */ void GetTgHitObj(); - /* 80084548 */ void GetTgHitGObj(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); -}; - -struct cM3dGSph { - /* 8026F648 */ void SetC(cXyz const&); - /* 8026F708 */ void SetR(f32); - /* 80C30D60 */ ~cM3dGSph(); -}; - -struct cM3dGPla { - /* 80C2E9F8 */ ~cM3dGPla(); -}; - -struct cM3dGAab { - /* 80C30DA8 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80C310F0 */ ~cCcD_GStts(); -}; - -struct cBgS_PolyInfo {}; - -struct cBgS_LinChk {}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 800744A0 */ void GroundCross(cBgS_GndChk*); - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct _GXTexObj {}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80C2E714 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -354,10 +123,6 @@ extern "C" void init__10Z2CreatureFP3VecP3VecUcUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); -extern "C" void PSVECSquareDistance(); extern "C" void __ptmf_test(); extern "C" void __ptmf_scall(); extern "C" void __cvt_fp2unsigned(); @@ -365,9 +130,6 @@ extern "C" void _savegpr_27(); extern "C" void _savegpr_29(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); -extern "C" void strcmp(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -377,9 +139,7 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" void __register_global_object(); // @@ -518,25 +278,30 @@ SECTION_DATA static void* lit_4901[3] = { #pragma pop /* 80C3136C-80C3138C -00001 0020+00 1/0 0/0 0/0 .data l_daObjKAG_Method */ -SECTION_DATA static void* l_daObjKAG_Method[8] = { - (void*)daObjKAG_Create__FP10fopAc_ac_c, - (void*)daObjKAG_Delete__FP10daObjKAG_c, - (void*)daObjKAG_Execute__FP10daObjKAG_c, - (void*)daObjKAG_IsDelete__FP10daObjKAG_c, - (void*)daObjKAG_Draw__FP10daObjKAG_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjKAG_Method = { + (process_method_func)daObjKAG_Create__FP10fopAc_ac_c, + (process_method_func)daObjKAG_Delete__FP10daObjKAG_c, + (process_method_func)daObjKAG_Execute__FP10daObjKAG_c, + (process_method_func)daObjKAG_IsDelete__FP10daObjKAG_c, + (process_method_func)daObjKAG_Draw__FP10daObjKAG_c, }; /* 80C3138C-80C313BC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Kag */ -SECTION_DATA extern void* g_profile_Obj_Kag[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01480000, (void*)&g_fpcLf_Method, - (void*)0x00000860, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01E50000, (void*)&l_daObjKAG_Method, - (void*)0x000C0100, (void*)0x030E0000, +extern actor_process_profile_definition g_profile_Obj_Kag = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Kag, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjKAG_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 485, // mPriority + &l_daObjKAG_Method, // sub_method + 0x000C0100, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C313BC-80C313C8 00014C 000C+00 0/0 0/0 0/0 .data __vt__9dInsect_c */ @@ -666,7 +431,8 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag/__dt__12J3DFrameCtrlFv.s" } @@ -749,7 +515,8 @@ asm void daObjKAG_c::Kag_Bgcheck(cXyz* param_0, csXyz* param_1, cXyz* param_2) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGPla::~cM3dGPla() { +// asm cM3dGPla::~cM3dGPla() { +extern "C" asm void __dt__8cM3dGPlaFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag/__dt__8cM3dGPlaFv.s" } @@ -1296,7 +1063,8 @@ asm void daObjKAG_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { +// asm cM3dGSph::~cM3dGSph() { +extern "C" asm void __dt__8cM3dGSphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag/__dt__8cM3dGSphFv.s" } @@ -1306,7 +1074,8 @@ asm cM3dGSph::~cM3dGSph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag/__dt__8cM3dGAabFv.s" } @@ -1316,7 +1085,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag/__dt__10dCcD_GSttsFv.s" } @@ -1367,7 +1137,8 @@ REGISTER_CTORS(0x80C310A8, __sinit_d_a_obj_kag_cpp); #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dInsect_c::Insect_Release() { +// asm void dInsect_c::Insect_Release() { +extern "C" asm void Insect_Release__9dInsect_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag/Insect_Release__9dInsect_cFv.s" } @@ -1377,7 +1148,8 @@ asm void dInsect_c::Insect_Release() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_kage/d_a_obj_kage.cpp b/rel/d/a/obj/d_a_obj_kage/d_a_obj_kage.cpp index f8163a36f99..7f091daf6ee 100644 --- a/rel/d/a/obj/d_a_obj_kage/d_a_obj_kage.cpp +++ b/rel/d/a/obj/d_a_obj_kage/d_a_obj_kage.cpp @@ -1,57 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_kage -// +/** + * @file d_a_obj_kage.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_kage/d_a_obj_kage.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_kage_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct csXyz {}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -64,7 +18,6 @@ extern "C" static void daObj_Kage_Delete__FP14obj_kage_class(); extern "C" static void useHeapInit__FP10fopAc_ac_c(); extern "C" static void daObj_Kage_Create__FP10fopAc_ac_c(); extern "C" extern char const* const d_a_obj_kage__stringBase0; -extern "C" extern void* g_profile_OBJ_KAGE[12]; // // External References: @@ -90,17 +43,12 @@ extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP extern "C" void cM_rndF__Ff(); extern "C" void cLib_addCalc2__FPffff(); extern "C" void __ct__16Z2SoundObjSimpleFv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; // @@ -268,25 +216,30 @@ static asm void daObj_Kage_Create(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80C3199C-80C319BC -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Kage_Method */ -SECTION_DATA static void* l_daObj_Kage_Method[8] = { - (void*)daObj_Kage_Create__FP10fopAc_ac_c, - (void*)daObj_Kage_Delete__FP14obj_kage_class, - (void*)daObj_Kage_Execute__FP14obj_kage_class, - (void*)daObj_Kage_IsDelete__FP14obj_kage_class, - (void*)daObj_Kage_Draw__FP14obj_kage_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObj_Kage_Method = { + (process_method_func)daObj_Kage_Create__FP10fopAc_ac_c, + (process_method_func)daObj_Kage_Delete__FP14obj_kage_class, + (process_method_func)daObj_Kage_Execute__FP14obj_kage_class, + (process_method_func)daObj_Kage_IsDelete__FP14obj_kage_class, + (process_method_func)daObj_Kage_Draw__FP14obj_kage_class, }; /* 80C319BC-80C319EC -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_KAGE */ -SECTION_DATA extern void* g_profile_OBJ_KAGE[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x011A0000, (void*)&g_fpcLf_Method, - (void*)0x000005B4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x003E0000, (void*)&l_daObj_Kage_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_KAGE = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_KAGE, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(obj_kage_class), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 62, // mPriority + &l_daObj_Kage_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C31990-80C31990 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_kago/d_a_obj_kago.cpp b/rel/d/a/obj/d_a_obj_kago/d_a_obj_kago.cpp index 4c4e115d50b..b12e162fa09 100644 --- a/rel/d/a/obj/d_a_obj_kago/d_a_obj_kago.cpp +++ b/rel/d/a/obj/d_a_obj_kago/d_a_obj_kago.cpp @@ -1,157 +1,14 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_kago -// +/** + * @file d_a_obj_kago.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_kago/d_a_obj_kago.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObj_Kago_c { - /* 80C31AEC */ ~daObj_Kago_c(); - /* 80C31D5C */ void create(); - /* 80C323D0 */ void CreateHeap(); - /* 80C324B0 */ void Delete(); - /* 80C324E4 */ void Execute(); - /* 80C332D0 */ void Draw(); - /* 80C333F0 */ void createHeapCallBack(fopAc_ac_c*); - /* 80C33410 */ void isDelete(); - /* 80C334B4 */ void setEnvTevColor(); - /* 80C33510 */ void setRoomNo(); - /* 80C33554 */ void reset(); - /* 80C3359C */ void setMtx(); - /* 80C33620 */ void getWallAngle(s16, s16*); - /* 80C337B0 */ void setGoalPosAndAngle(); - /* 80C338D0 */ void setSmokePrtcl(); - /* 80C33958 */ void setWaterPrtcl(); - /* 80C33A58 */ void setHamonPrtcl(); -}; - -struct daObj_Kago_Param_c { - /* 80C33C14 */ ~daObj_Kago_Param_c(); - - static u8 const m[44]; -}; - -struct daNpcT_c { - static u8 const mCcDObjData[48]; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B8B4 */ void forceOnEventMove(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80C32360 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80C32258 */ ~dBgS_AcchCir(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct dBgS { - /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_LinChk {}; -struct cBgS_GndChk { - /* 80267C1C */ cBgS_GndChk(); - /* 80267C94 */ ~cBgS_GndChk(); -}; -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); -}; - -struct _GXTexObj {}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -272,9 +129,6 @@ extern "C" void cLib_addCalcAngleS2__FPssss(); extern "C" void cLib_chaseF__FPfff(); extern "C" void cLib_chaseAngleS__FPsss(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void _savegpr_24(); @@ -284,8 +138,6 @@ extern "C" void _restgpr_24(); extern "C" void _restgpr_25(); extern "C" void _restgpr_27(); extern "C" u8 const mCcDObjData__8daNpcT_c[48]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -294,7 +146,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" void __register_global_object(); @@ -360,25 +211,30 @@ SECTION_DATA static u8 emttrId[8] = { }; /* 80C33E24-80C33E44 -00001 0020+00 1/0 0/0 0/0 .data daObj_Kago_MethodTable */ -SECTION_DATA static void* daObj_Kago_MethodTable[8] = { - (void*)daObj_Kago_Create__FPv, - (void*)daObj_Kago_Delete__FPv, - (void*)daObj_Kago_Execute__FPv, - (void*)daObj_Kago_IsDelete__FPv, - (void*)daObj_Kago_Draw__FPv, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObj_Kago_MethodTable = { + (process_method_func)daObj_Kago_Create__FPv, + (process_method_func)daObj_Kago_Delete__FPv, + (process_method_func)daObj_Kago_Execute__FPv, + (process_method_func)daObj_Kago_IsDelete__FPv, + (process_method_func)daObj_Kago_Draw__FPv, }; /* 80C33E44-80C33E74 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_KAGO */ -SECTION_DATA extern void* g_profile_OBJ_KAGO[12] = { - (void*)0xFFFFFFFD, (void*)0x0008FFFD, - (void*)0x02FB0000, (void*)&g_fpcLf_Method, - (void*)0x00000BA8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02CD0000, (void*)&daObj_Kago_MethodTable, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_KAGO = { + fpcLy_CURRENT_e, // mLayerID + 8, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_KAGO, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObj_Kago_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 717, // mPriority + &daObj_Kago_MethodTable, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C33E74-80C33E80 0000D4 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */ @@ -580,7 +436,8 @@ extern "C" asm void __dt__8cM3dGAabFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kago/d_a_obj_kago/__dt__12dBgS_AcchCirFv.s" } @@ -612,7 +469,8 @@ extern "C" asm void __dt__4cXyzFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kago/d_a_obj_kago/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.cpp b/rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.cpp index dd880988f0b..13f066a5234 100644 --- a/rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.cpp +++ b/rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.cpp @@ -1,91 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_kaisou -// +/** + * @file d_a_obj_kaisou.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static f32 mGroundY; -}; - -struct J3DModel {}; - -struct J3DJoint {}; - -struct daObjKaisou_c { - /* 80C34058 */ void ctrlJoint(J3DJoint*, J3DModel*); - /* 80C34390 */ void initCcCylinder(); - /* 80C343F0 */ void setCcCylinder(); - /* 80C34438 */ void ObjHit(); - /* 80C34824 */ void Execute(); - /* 80C34A98 */ void Delete(); - /* 80C34ACC */ void setBaseMtx(); - /* 80C34BD8 */ void create(); -}; - -struct dSv_memBit_c { - /* 80034934 */ void isDungeonItem(int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DSys { - static u8 mCurrentMtx[48]; -}; // // Forward References: @@ -146,13 +67,10 @@ extern "C" void SetC__8cM3dGCylFRC4cXyz(); extern "C" void cLib_addCalcAngleS__FPsssss(); extern "C" void __ct__16Z2SoundObjSimpleFv(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -160,8 +78,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" f32 mGroundY__11fopAcM_gc_c; @@ -537,25 +453,30 @@ SECTION_DEAD static char const* const stringBase_80C34FB6 = "D_MN01A"; #pragma pop /* 80C35038-80C35058 -00001 0020+00 1/0 0/0 0/0 .data l_daObjKaisou_Method */ -SECTION_DATA static void* l_daObjKaisou_Method[8] = { - (void*)daObjKaisou_Create__FP10fopAc_ac_c, - (void*)daObjKaisou_Delete__FP13daObjKaisou_c, - (void*)daObjKaisou_Execute__FP13daObjKaisou_c, - (void*)daObjKaisou_IsDelete__FP13daObjKaisou_c, - (void*)daObjKaisou_Draw__FP13daObjKaisou_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjKaisou_Method = { + (process_method_func)daObjKaisou_Create__FP10fopAc_ac_c, + (process_method_func)daObjKaisou_Delete__FP13daObjKaisou_c, + (process_method_func)daObjKaisou_Execute__FP13daObjKaisou_c, + (process_method_func)daObjKaisou_IsDelete__FP13daObjKaisou_c, + (process_method_func)daObjKaisou_Draw__FP13daObjKaisou_c, }; /* 80C35058-80C35088 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Kaisou */ -SECTION_DATA extern void* g_profile_Obj_Kaisou[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x006A0000, (void*)&g_fpcLf_Method, - (void*)0x0000079C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01CC0000, (void*)&l_daObjKaisou_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Kaisou = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Kaisou, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjKaisou_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 460, // mPriority + &l_daObjKaisou_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C35088-80C35094 0000C8 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ diff --git a/rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri.cpp b/rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri.cpp index b36046d5e59..be67226bc7e 100644 --- a/rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri.cpp +++ b/rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri.cpp @@ -1,213 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_kamakiri -// +/** + * @file d_a_obj_kamakiri.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF0C */ void ZXYrotS(csXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; - -struct mDoExt_McaMorfSO { - /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, - int, Z2Creature*, u32, u32); - /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32); - /* 800110B0 */ void play(u32, s8); - /* 800111C0 */ void entryDL(); - /* 800111EC */ void modelCalc(); - /* 80011310 */ void stopZelAnime(); -}; - -struct fopAc_ac_c {}; - -struct daPy_boomerangMove_c { - /* 8015E5B0 */ void initOffset(cXyz const*); - /* 8015E654 */ void posMove(cXyz*, s16*, fopAc_ac_c*, s16); - /* 8015E87C */ void bgCheckAfterOffset(cXyz const*); -}; - -struct daObj_KamHIO_c { - /* 80C3518C */ daObj_KamHIO_c(); - /* 80C38360 */ ~daObj_KamHIO_c(); -}; - -struct daObjKAM_c { - /* 80C351BC */ void InitCcSph(); - /* 80C35228 */ void SetCcSph(); - /* 80C352A0 */ void CreateHeap(); - /* 80C35684 */ void ShopWaitAction(); - /* 80C357EC */ void WaitAction(); - /* 80C35970 */ void WallCheck(); - /* 80C35BE4 */ void SpeedSet(); - /* 80C35CF0 */ void WallWalk(); - /* 80C36138 */ void WalkAction(); - /* 80C36338 */ void MoveAction(); - /* 80C36B20 */ void Action(); - /* 80C36BE4 */ void ShopAction(); - /* 80C36CA0 */ void Insect_Release(); - /* 80C36CB8 */ void Z_BufferChk(); - /* 80C36E34 */ void ParticleSet(); - /* 80C36F58 */ void BoomChk(); - /* 80C37324 */ void ObjHit(); - /* 80C374AC */ void Execute(); - /* 80C37724 */ void Delete(); - /* 80C3778C */ void setBaseMtx(); - /* 80C378F4 */ void CreateChk(); - /* 80C37AA0 */ void create(); -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dMenu_Insect_c { - /* 801D9F3C */ void isCatchNotGiveInsect(u8); -}; - -struct dInsect_c { - /* 8015E010 */ dInsect_c(); - /* 8015E078 */ void Insect_GetDemoMain(); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dDlst_peekZ_c { - /* 80056018 */ void newData(s16, s16, u32*); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80C38258 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); -}; - -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_PolyInfo {}; - -struct cBgS_LinChk {}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; -struct _GXTexObj {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80C355F8 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -334,16 +134,12 @@ extern "C" void init__10Z2CreatureFP3VecP3VecUcUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void _savegpr_24(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_24(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -353,7 +149,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" void __register_global_object(); // @@ -370,25 +165,30 @@ SECTION_RODATA static f32 const lit_3776 = 6.0f / 5.0f; COMPILER_STRIP_GATE(0x80C3840C, &lit_3776); /* 80C3850C-80C3852C -00001 0020+00 1/0 0/0 0/0 .data l_daObjKAM_Method */ -SECTION_DATA static void* l_daObjKAM_Method[8] = { - (void*)daObjKAM_Create__FP10fopAc_ac_c, - (void*)daObjKAM_Delete__FP10daObjKAM_c, - (void*)daObjKAM_Execute__FP10daObjKAM_c, - (void*)daObjKAM_IsDelete__FP10daObjKAM_c, - (void*)daObjKAM_Draw__FP10daObjKAM_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjKAM_Method = { + (process_method_func)daObjKAM_Create__FP10fopAc_ac_c, + (process_method_func)daObjKAM_Delete__FP10daObjKAM_c, + (process_method_func)daObjKAM_Execute__FP10daObjKAM_c, + (process_method_func)daObjKAM_IsDelete__FP10daObjKAM_c, + (process_method_func)daObjKAM_Draw__FP10daObjKAM_c, }; /* 80C3852C-80C3855C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Kam */ -SECTION_DATA extern void* g_profile_Obj_Kam[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01450000, (void*)&g_fpcLf_Method, - (void*)0x00000A68, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01E20000, (void*)&l_daObjKAM_Method, - (void*)0x000C0120, (void*)0x030E0000, +extern actor_process_profile_definition g_profile_Obj_Kam = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Kam, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjKAM_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 482, // mPriority + &l_daObjKAM_Method, // sub_method + 0x000C0120, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C3855C-80C38580 000050 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ @@ -530,7 +330,8 @@ asm void daObjKAM_c::CreateHeap() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri/__dt__12J3DFrameCtrlFv.s" } @@ -1067,7 +868,8 @@ asm void daObjKAM_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_kanban2/d_a_obj_kanban2.cpp b/rel/d/a/obj/d_a_obj_kanban2/d_a_obj_kanban2.cpp index c95de4671ee..8f5cb4a57c5 100644 --- a/rel/d/a/obj/d_a_obj_kanban2/d_a_obj_kanban2.cpp +++ b/rel/d/a/obj/d_a_obj_kanban2/d_a_obj_kanban2.cpp @@ -1,251 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_kanban2 -// +/** + * @file d_a_obj_kanban2.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_kanban2/d_a_obj_kanban2.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - -struct Vec {}; - -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; - /* 805818DC */ ~cXyz(); - - static f32 Zero[3]; -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CDD4 */ void transM(cXyz const&); - /* 8000CE38 */ void scaleM(f32, f32, f32); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObj_Kanban2_c { - /* 80581790 */ void draw(); - /* 80581938 */ void setKanbanSE(int); - /* 805819BC */ void createBreakParts(u32, csXyz); - /* 805819FC */ void createWallHitBreak(); - /* 80581B5C */ void getKanbanCutType(); - /* 80581C48 */ void getKanbanWolfCutType(); - /* 80581D04 */ void damage_check(); - /* 8058221C */ void float_damage_check(); - /* 805822F0 */ void deletePart(); - /* 805825A4 */ void getWallAngle(); - /* 8058271C */ void setGroundAngle(); - /* 80582894 */ void checkWaterSurface(); - /* 80582944 */ void checkPataGround(s16, s16); - /* 80582A68 */ void setCullMtx(); - /* 80582AAC */ void setSmokeEffect(cXyz); - /* 80582AFC */ void setWaterEffect(); - /* 80582C40 */ void setCenterPos(); - /* 80582E68 */ void checkCarryOn(); - /* 80582EF0 */ void setActionMode(int, int); - /* 80582F40 */ void calcNormalSwing(); - /* 80583364 */ void executeNormal(); - /* 80583598 */ void initPart(); - /* 80583A2C */ void executePart(); - /* 8058437C */ void executeFloat(); - /* 80584884 */ void executeCarry(); - /* 805849CC */ void action(); - /* 80584AD8 */ void mtx_set(); - /* 80584CFC */ void cc_set(); - /* 80584DF0 */ void execute(); - /* 80584ED8 */ void _delete(); - /* 80584F64 */ void CreateHeap(); - /* 805850E8 */ void create(); -}; - -struct daObj_Kanban2_HIO_c { - /* 8058176C */ daObj_Kanban2_HIO_c(); - /* 80585578 */ ~daObj_Kanban2_HIO_c(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dMsgFlow_c { - /* 80249F00 */ dMsgFlow_c(); - /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**); - /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcSph {}; - -struct dCcD_Sph { - /* 80084A34 */ void Set(dCcD_SrcSph const&); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 800844F8 */ void GetTgHitObj(); - /* 80084658 */ void ChkCoHit(); - /* 800846F0 */ void GetCoHitObj(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjGndChk_Spl { - /* 800777B0 */ dBgS_ObjGndChk_Spl(); - /* 80077848 */ ~dBgS_ObjGndChk_Spl(); -}; - -struct dBgS_ObjAcch { - /* 805854E8 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); -}; - -struct dBgS {}; -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); - /* 80077114 */ void SetGroundUpY(f32); -}; - -struct cM3dGSph { - /* 8026F648 */ void SetC(cXyz const&); - /* 8026F708 */ void SetR(f32); - /* 80585458 */ ~cM3dGSph(); -}; - -struct cM3dGPla { - /* 805826D4 */ ~cM3dGPla(); -}; - -struct cM3dGAab { - /* 805854A0 */ ~cM3dGAab(); -}; - -struct cCcD_Obj { - /* 80263A48 */ void GetAc(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_Stts { - /* 8026395C */ void ClrCcMove(); -}; - -struct cBgS_PolyInfo {}; - -struct cBgS_LinChk {}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); - /* 80267D0C */ void SetPos(Vec const*); -}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 800744A0 */ void GroundCross(cBgS_GndChk*); - /* 80074660 */ void ChkPolySafe(cBgS_PolyInfo const&); - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct _GXTexObj {}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDFF8 */ void deleteObject(); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -389,10 +150,6 @@ extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void deleteObject__14Z2SoundObjBaseFv(); extern "C" void __ct__16Z2SoundObjSimpleFv(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSVECAdd(); -extern "C" void PSVECSubtract(); -extern "C" void PSVECSquareDistance(); extern "C" void _savegpr_23(); extern "C" void _savegpr_25(); extern "C" void _savegpr_26(); @@ -405,9 +162,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void abs(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; @@ -416,10 +170,8 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" f32 Zero__4cXyz[3]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -641,25 +393,30 @@ SECTION_DATA static u8 kn2_speed_rate[12] = { }; /* 80585BCC-80585BEC -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Kanban2_Method */ -SECTION_DATA static void* l_daObj_Kanban2_Method[8] = { - (void*)daObj_Kanban2_Create__FP15daObj_Kanban2_c, - (void*)daObj_Kanban2_Delete__FP15daObj_Kanban2_c, - (void*)daObj_Kanban2_Execute__FP15daObj_Kanban2_c, - (void*)daObj_Kanban2_IsDelete__FP15daObj_Kanban2_c, - (void*)daObj_Kanban2_Draw__FP15daObj_Kanban2_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObj_Kanban2_Method = { + (process_method_func)daObj_Kanban2_Create__FP15daObj_Kanban2_c, + (process_method_func)daObj_Kanban2_Delete__FP15daObj_Kanban2_c, + (process_method_func)daObj_Kanban2_Execute__FP15daObj_Kanban2_c, + (process_method_func)daObj_Kanban2_IsDelete__FP15daObj_Kanban2_c, + (process_method_func)daObj_Kanban2_Draw__FP15daObj_Kanban2_c, }; /* 80585BEC-80585C1C -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_KANBAN2 */ -SECTION_DATA extern void* g_profile_OBJ_KANBAN2[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x011B0000, (void*)&g_fpcLf_Method, - (void*)0x00000A50, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x003F0000, (void*)&l_daObj_Kanban2_Method, - (void*)0x00044100, (void*)0x03000000, +extern actor_process_profile_definition g_profile_OBJ_KANBAN2 = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_KANBAN2, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObj_Kanban2_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 63, // mPriority + &l_daObj_Kanban2_Method, // sub_method + 0x00044100, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_0_e, // cullType }; /* 80585C1C-80585C28 0003B0 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGSph */ @@ -748,7 +505,8 @@ asm void daObj_Kanban2_c::draw() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kanban2/d_a_obj_kanban2/__dt__4cXyzFv.s" } @@ -972,7 +730,8 @@ asm void daObj_Kanban2_c::getWallAngle() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGPla::~cM3dGPla() { +// asm cM3dGPla::~cM3dGPla() { +extern "C" asm void __dt__8cM3dGPlaFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kanban2/d_a_obj_kanban2/__dt__8cM3dGPlaFv.s" } @@ -1609,7 +1368,8 @@ asm void daObj_Kanban2_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { +// asm cM3dGSph::~cM3dGSph() { +extern "C" asm void __dt__8cM3dGSphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kanban2/d_a_obj_kanban2/__dt__8cM3dGSphFv.s" } @@ -1619,7 +1379,8 @@ asm cM3dGSph::~cM3dGSph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kanban2/d_a_obj_kanban2/__dt__8cM3dGAabFv.s" } @@ -1629,7 +1390,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kanban2/d_a_obj_kanban2/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.cpp b/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.cpp index f01499a3a7c..3350f1e9f35 100644 --- a/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.cpp +++ b/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_kantera -// +/** + * @file d_a_obj_kantera.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.h" #include "d/com/d_com_inf_game.h" @@ -10,61 +10,6 @@ #include "dol2asm.h" #include "f_op/f_op_actor_mng.h" -// -// Types: -// - -#ifdef NONMATCHING -class daItemKantera_c : public daItemBase_c { -public: - /* 80C389BC */ void initBaseMtx(); - /* 80C389F8 */ void setBaseMtx(); - /* 80C38A64 */ int Create(); - /* 80C38BA8 */ int __CreateHeap(); - /* 80C38BB0 */ int create(); - /* 80C38F78 */ void bg_check(); - /* 80C39068 */ int actionInit(); - /* 80C390A0 */ int actionWaitInit(); - /* 80C3911C */ int actionWait(); - /* 80C39234 */ int initActionOrderGetDemo(); - /* 80C392D0 */ int actionOrderGetDemo(); - /* 80C3934C */ int actionGetDemo(); - /* 80C393B0 */ int execute(); - /* 80C394DC */ int draw(); - /* 80C39530 */ int _delete(); - - void setStatus(u8 i_status) { mStatus = i_status; } - - /* 0x92C */ u32 field_0x92c; - /* 0x930 */ s32 field_0x930; - /* 0x934 */ u8 mStatus; - /* 0x935 */ u8 field_0x935; - /* 0x936 */ u8 field_0x936; - /* 0x937 */ u8 field_0x937; - /* 0x938 */ s16 field_0x938; - /* 0x93A */ s16 field_0x93a; - /* 0x93C */ cXyz field_0x93c; -}; // Size: 0x948 -#else -struct daItemKantera_c { - /* 80C389BC */ void initBaseMtx(); - /* 80C389F8 */ void setBaseMtx(); - /* 80C38A64 */ int Create(); - /* 80C38BA8 */ int __CreateHeap(); - /* 80C38BB0 */ int create(); - /* 80C38F78 */ void bg_check(); - /* 80C39068 */ int actionInit(); - /* 80C390A0 */ int actionWaitInit(); - /* 80C3911C */ int actionWait(); - /* 80C39234 */ int initActionOrderGetDemo(); - /* 80C392D0 */ int actionOrderGetDemo(); - /* 80C3934C */ int actionGetDemo(); - /* 80C393B0 */ int execute(); - /* 80C394DC */ int draw(); - /* 80C39530 */ int _delete(); -}; -#endif - // // Forward References: // @@ -297,25 +242,30 @@ SECTION_DATA static u8 l_demoFunc[48] = { #pragma pop /* 80C3975C-80C3977C -00001 0020+00 1/0 0/0 0/0 .data l_daItemKantera_Method */ -SECTION_DATA static void* l_daItemKantera_Method[8] = { - (void*)daItemKantera_Create__FP10fopAc_ac_c, - (void*)daItemKantera_Delete__FP15daItemKantera_c, - (void*)daItemKantera_Execute__FP15daItemKantera_c, - (void*)NULL, - (void*)daItemKantera_Draw__FP15daItemKantera_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daItemKantera_Method = { + (process_method_func)daItemKantera_Create__FP10fopAc_ac_c, + (process_method_func)daItemKantera_Delete__FP15daItemKantera_c, + (process_method_func)daItemKantera_Execute__FP15daItemKantera_c, + 0, + (process_method_func)daItemKantera_Draw__FP15daItemKantera_c, }; /* 80C3977C-80C397AC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Kantera */ -SECTION_DATA extern void* g_profile_Obj_Kantera[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x021A0000, (void*)&g_fpcLf_Method, - (void*)0x00000948, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00EE0000, (void*)&l_daItemKantera_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Kantera = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Kantera, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daItemKantera_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 238, // mPriority + &l_daItemKantera_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C397AC-80C397B8 0000D0 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ diff --git a/rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri.cpp b/rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri.cpp index adc16b34f71..f97e1524208 100644 --- a/rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri.cpp +++ b/rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri.cpp @@ -1,218 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_katatsumuri -// +/** + * @file d_a_obj_katatsumuri.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; - -struct mDoExt_McaMorfSO { - /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, - int, Z2Creature*, u32, u32); - /* 800110B0 */ void play(u32, s8); - /* 800111C0 */ void entryDL(); - /* 800111EC */ void modelCalc(); - /* 80011310 */ void stopZelAnime(); -}; - -struct fopAc_ac_c {}; - -struct daPy_boomerangMove_c { - /* 8015E5B0 */ void initOffset(cXyz const*); - /* 8015E654 */ void posMove(cXyz*, s16*, fopAc_ac_c*, s16); - /* 8015E87C */ void bgCheckAfterOffset(cXyz const*); -}; - -struct daObj_KatHIO_c { - /* 80C3996C */ daObj_KatHIO_c(); - /* 80C3C5CC */ ~daObj_KatHIO_c(); -}; - -struct J3DModel {}; - -struct J3DJoint {}; - -struct daObjKAT_c { - /* 80C39994 */ void InitCcSph(); - /* 80C39A00 */ void SetCcSph(); - /* 80C39A58 */ void ctrlJoint(J3DJoint*, J3DModel*); - /* 80C39B98 */ void CreateHeap(); - /* 80C39F0C */ void WallWalk(); - /* 80C3A4D8 */ void MoveAction(); - /* 80C3A628 */ void Action(); - /* 80C3A680 */ void Insect_Release(); - /* 80C3A698 */ void checkGround(); - /* 80C3A8C8 */ void F_MoveAction(); - /* 80C3A95C */ void FallAction(); - /* 80C3A990 */ void ParticleSet(); - /* 80C3AAB4 */ void BoomChk(); - /* 80C3ADC8 */ void ObjHit(); - /* 80C3AEC8 */ void Execute(); - /* 80C3B754 */ void Z_BufferChk(); - /* 80C3B8D0 */ void Delete(); - /* 80C3B938 */ void setBaseMtx(); - /* 80C3BAAC */ void CreateChk(); - /* 80C3BC58 */ void create(); -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dMenu_Insect_c { - /* 801D9F3C */ void isCatchNotGiveInsect(u8); -}; - -struct dInsect_c { - /* 8015E010 */ dInsect_c(); - /* 8015E078 */ void Insect_GetDemoMain(); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dDlst_peekZ_c { - /* 80056018 */ void newData(s16, s16, u32*); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80C3C554 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); -}; - -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_PolyInfo {}; - -struct cBgS_LinChk {}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct _GXTexObj {}; - -struct J3DSys { - static u8 mCurrentMtx[48]; -}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80C39E80 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -338,8 +133,6 @@ extern "C" void init__10Z2CreatureFP3VecP3VecUcUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void _savegpr_24(); extern "C" void _savegpr_26(); extern "C" void _savegpr_28(); @@ -348,8 +141,6 @@ extern "C" void _restgpr_24(); extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -359,8 +150,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" void __register_global_object(); @@ -374,25 +163,30 @@ SECTION_RODATA static f32 const lit_3775 = 1.0f; COMPILER_STRIP_GATE(0x80C3C674, &lit_3775); /* 80C3C770-80C3C790 -00001 0020+00 1/0 0/0 0/0 .data l_daObjKAT_Method */ -SECTION_DATA static void* l_daObjKAT_Method[8] = { - (void*)daObjKAT_Create__FP10fopAc_ac_c, - (void*)daObjKAT_Delete__FP10daObjKAT_c, - (void*)daObjKAT_Execute__FP10daObjKAT_c, - (void*)daObjKAT_IsDelete__FP10daObjKAT_c, - (void*)daObjKAT_Draw__FP10daObjKAT_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjKAT_Method = { + (process_method_func)daObjKAT_Create__FP10fopAc_ac_c, + (process_method_func)daObjKAT_Delete__FP10daObjKAT_c, + (process_method_func)daObjKAT_Execute__FP10daObjKAT_c, + (process_method_func)daObjKAT_IsDelete__FP10daObjKAT_c, + (process_method_func)daObjKAT_Draw__FP10daObjKAT_c, }; /* 80C3C790-80C3C7C0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Kat */ -SECTION_DATA extern void* g_profile_Obj_Kat[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x014B0000, (void*)&g_fpcLf_Method, - (void*)0x00000A74, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01E80000, (void*)&l_daObjKAT_Method, - (void*)0x000C0100, (void*)0x030E0000, +extern actor_process_profile_definition g_profile_Obj_Kat = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Kat, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjKAT_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 488, // mPriority + &l_daObjKAT_Method, // sub_method + 0x000C0100, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C3C7C0-80C3C7CC 000050 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGSph */ @@ -570,7 +364,8 @@ asm void daObjKAT_c::CreateHeap() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri/__dt__12J3DFrameCtrlFv.s" } @@ -1069,7 +864,8 @@ extern "C" asm void __dt__8cM3dGAabFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_kazeneko/d_a_obj_kazeneko.cpp b/rel/d/a/obj/d_a_obj_kazeneko/d_a_obj_kazeneko.cpp index 91b0d1e10b3..2b52d06341b 100644 --- a/rel/d/a/obj/d_a_obj_kazeneko/d_a_obj_kazeneko.cpp +++ b/rel/d/a/obj/d_a_obj_kazeneko/d_a_obj_kazeneko.cpp @@ -1,70 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_kazeneko -// +/** + * @file d_a_obj_kazeneko.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_kazeneko/d_a_obj_kazeneko.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjKazeNeko_c { - /* 80C3C8D8 */ void create_init(); - /* 80C3C968 */ void initBaseMtx(); - /* 80C3C988 */ void setBaseMtx(); - /* 80C3CA8C */ void initCcCylinder(); - /* 80C3CB10 */ void setCcCylinder(); - /* 80C3CB7C */ void swingHead(); - /* 80C3CC40 */ void getFirstVec(cXyz*, int); - - static u8 const M_attr[44]; -}; - -struct daNPC_TK_c { - /* 80B0A568 */ void endHawkCamera(); -}; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -127,15 +70,12 @@ extern "C" void SetR__8cM3dGCylFf(); extern "C" void cLib_chaseF__FPfff(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); extern "C" void _savegpr_24(); extern "C" void _savegpr_27(); extern "C" void _savegpr_28(); extern "C" void _restgpr_24(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -143,8 +83,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void endHawkCamera__10daNPC_TK_cFv(); @@ -368,25 +306,30 @@ static bool daObjKazeNeko_IsDelete(daObjKazeNeko_c* param_0) { /* ############################################################################################## */ /* 80C3D494-80C3D4B4 -00001 0020+00 1/0 0/0 0/0 .data l_daObjKazeNeko_Method */ -SECTION_DATA static void* l_daObjKazeNeko_Method[8] = { - (void*)daObjKazeNeko_Create__FP10fopAc_ac_c, - (void*)daObjKazeNeko_Delete__FP15daObjKazeNeko_c, - (void*)daObjKazeNeko_Execute__FP15daObjKazeNeko_c, - (void*)daObjKazeNeko_IsDelete__FP15daObjKazeNeko_c, - (void*)daObjKazeNeko_Draw__FP15daObjKazeNeko_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjKazeNeko_Method = { + (process_method_func)daObjKazeNeko_Create__FP10fopAc_ac_c, + (process_method_func)daObjKazeNeko_Delete__FP15daObjKazeNeko_c, + (process_method_func)daObjKazeNeko_Execute__FP15daObjKazeNeko_c, + (process_method_func)daObjKazeNeko_IsDelete__FP15daObjKazeNeko_c, + (process_method_func)daObjKazeNeko_Draw__FP15daObjKazeNeko_c, }; /* 80C3D4B4-80C3D4E4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_KazeNeko */ -SECTION_DATA extern void* g_profile_Obj_KazeNeko[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x014E0000, (void*)&g_fpcLf_Method, - (void*)0x00000754, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x001E0000, (void*)&l_daObjKazeNeko_Method, - (void*)0x00044180, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_KazeNeko = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_KazeNeko, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjKazeNeko_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 30, // mPriority + &l_daObjKazeNeko_Method, // sub_method + 0x00044180, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C3D4E4-80C3D4F0 000054 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */ diff --git a/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket.cpp b/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket.cpp index e9e790ee3fe..d65a60d36c0 100644 --- a/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket.cpp +++ b/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket.cpp @@ -1,155 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_kbacket -// +/** + * @file d_a_obj_kbacket.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObj_KBacket_c { - /* 80585E4C */ ~daObj_KBacket_c(); - /* 80586048 */ void create(); - /* 80586604 */ void CreateHeap(); - /* 80586704 */ void Delete(); - /* 80586738 */ void Execute(); - /* 8058742C */ void Draw(); - /* 805875A0 */ void createHeapCallBack(fopAc_ac_c*); - /* 805875C0 */ void setEnvTevColor(); - /* 8058761C */ void setRoomNo(); - /* 80587660 */ void reset(); - /* 80587694 */ void setMtx(); - /* 805877C4 */ void calcRollAngle(s16, int); - /* 80587864 */ void getWallAngle(s16, s16*); - /* 805879F4 */ void setSmokePrtcl(); - /* 80587A70 */ void setWaterPrtcl(); - /* 80587B68 */ void setHamonPrtcl(); -}; - -struct daObj_KBacket_Param_c { - /* 80587D18 */ ~daObj_KBacket_Param_c(); - - static u8 const m[44]; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B8B4 */ void forceOnEventMove(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct _GXTexObj {}; - -struct dDlst_shadowControl_c { - /* 80055F84 */ void setSimple(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*); - static u8 mSimpleTexObj[32]; -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80586594 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F40 */ void SetWallR(f32); - /* 805864C8 */ ~dBgS_AcchCir(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct dBgS { - /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_LinChk {}; - -struct cBgS_GndChk { - /* 80267C1C */ cBgS_GndChk(); - /* 80267C94 */ ~cBgS_GndChk(); -}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -265,9 +123,6 @@ extern "C" void cLib_chaseF__FPfff(); extern "C" void cLib_chaseAngleS__FPsss(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void _savegpr_24(); extern "C" void _savegpr_25(); extern "C" void _savegpr_26(); @@ -278,8 +133,6 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -288,7 +141,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -352,25 +204,30 @@ SECTION_DATA static u8 emttrId[8] = { }; /* 80587EF8-80587F18 -00001 0020+00 1/0 0/0 0/0 .data daObj_KBacket_MethodTable */ -SECTION_DATA static void* daObj_KBacket_MethodTable[8] = { - (void*)daObj_KBacket_Create__FPv, - (void*)daObj_KBacket_Delete__FPv, - (void*)daObj_KBacket_Execute__FPv, - (void*)daObj_KBacket_IsDelete__FPv, - (void*)daObj_KBacket_Draw__FPv, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObj_KBacket_MethodTable = { + (process_method_func)daObj_KBacket_Create__FPv, + (process_method_func)daObj_KBacket_Delete__FPv, + (process_method_func)daObj_KBacket_Execute__FPv, + (process_method_func)daObj_KBacket_IsDelete__FPv, + (process_method_func)daObj_KBacket_Draw__FPv, }; /* 80587F18-80587F48 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_KBACKET */ -SECTION_DATA extern void* g_profile_OBJ_KBACKET[12] = { - (void*)0xFFFFFFFD, (void*)0x0008FFFD, - (void*)0x02F60000, (void*)&g_fpcLf_Method, - (void*)0x00000A54, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02CA0000, (void*)&daObj_KBacket_MethodTable, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_KBACKET = { + fpcLy_CURRENT_e, // mLayerID + 8, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_KBACKET, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObj_KBacket_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 714, // mPriority + &daObj_KBacket_MethodTable, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80587F48-80587F54 0000D0 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGPla */ @@ -553,7 +410,8 @@ extern "C" asm void __dt__8cM3dGAabFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket/__dt__12dBgS_AcchCirFv.s" } @@ -574,7 +432,8 @@ extern "C" asm void __dt__10dCcD_GSttsFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.cpp b/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.cpp index 29fed0c3b8d..7d60f8017f1 100644 --- a/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.cpp +++ b/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.cpp @@ -1,172 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_kbox -// +/** + * @file d_a_obj_kbox.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_kbox_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObj_Kbox_HIO_c { - /* 80C3D60C */ daObj_Kbox_HIO_c(); - /* 80C3EF98 */ ~daObj_Kbox_HIO_c(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct JPABaseEmitter {}; - -struct dPa_modelEcallBack { - /* 8004AC00 */ void setModel(JPABaseEmitter*, J3DModelData*, dKy_tevstr_c const&, u8, void*, u8, - u8); - - static u8 mEcallback[4]; -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dCcU_AtInfo {}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjGndChk_Spl { - /* 800777B0 */ dBgS_ObjGndChk_Spl(); - /* 80077848 */ ~dBgS_ObjGndChk_Spl(); -}; - -struct dBgS_ObjGndChk { - /* 80C3DDC4 */ ~dBgS_ObjGndChk(); -}; - -struct dBgS_ObjAcch { - /* 80C3EF28 */ ~dBgS_ObjAcch(); -}; -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS_PolyInfo {}; - -struct cBgS_LinChk {}; - -struct cBgS_GndChk { - /* 80267D0C */ void SetPos(Vec const*); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 800744A0 */ void GroundCross(cBgS_GndChk*); -}; - -struct _GXTexObj {}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDFF8 */ void deleteObject(); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -280,9 +121,6 @@ extern "C" void deleteObject__14Z2SoundObjBaseFv(); extern "C" void __ct__16Z2SoundObjSimpleFv(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void _savegpr_21(); extern "C" void _savegpr_26(); extern "C" void _savegpr_27(); @@ -293,8 +131,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; @@ -303,7 +139,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" u8 mEcallback__18dPa_modelEcallBack[4]; @@ -339,25 +174,30 @@ static dCcD_SrcSph cc_sph_src = { }; /* 80C3F174-80C3F194 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Kbox_Method */ -SECTION_DATA static void* l_daObj_Kbox_Method[8] = { - (void*)daObj_Kbox_Create__FP10fopAc_ac_c, - (void*)daObj_Kbox_Delete__FP14obj_kbox_class, - (void*)daObj_Kbox_Execute__FP14obj_kbox_class, - (void*)daObj_Kbox_IsDelete__FP14obj_kbox_class, - (void*)daObj_Kbox_Draw__FP14obj_kbox_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObj_Kbox_Method = { + (process_method_func)daObj_Kbox_Create__FP10fopAc_ac_c, + (process_method_func)daObj_Kbox_Delete__FP14obj_kbox_class, + (process_method_func)daObj_Kbox_Execute__FP14obj_kbox_class, + (process_method_func)daObj_Kbox_IsDelete__FP14obj_kbox_class, + (process_method_func)daObj_Kbox_Draw__FP14obj_kbox_class, }; /* 80C3F194-80C3F1C4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_KBOX */ -SECTION_DATA extern void* g_profile_OBJ_KBOX[12] = { - (void*)0xFFFFFFFD, (void*)0x0008FFFD, - (void*)0x02EF0000, (void*)&g_fpcLf_Method, - (void*)0x000009F0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x002B0000, (void*)&l_daObj_Kbox_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_KBOX = { + fpcLy_CURRENT_e, // mLayerID + 8, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_KBOX, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(obj_kbox_class), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 43, // mPriority + &l_daObj_Kbox_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C3F1C4-80C3F1D0 000098 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGSph */ @@ -701,7 +541,8 @@ static asm void water_check(obj_kbox_class* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +// asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +extern "C" asm void __dt__14dBgS_ObjGndChkFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox/__dt__14dBgS_ObjGndChkFv.s" } @@ -1033,7 +874,8 @@ extern "C" asm void __dt__8cM3dGAabFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_key/d_a_obj_key.cpp b/rel/d/a/obj/d_a_obj_key/d_a_obj_key.cpp index 4ac295cf84d..948bd6a7d91 100644 --- a/rel/d/a/obj/d_a_obj_key/d_a_obj_key.cpp +++ b/rel/d/a/obj/d_a_obj_key/d_a_obj_key.cpp @@ -1,158 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_key -// +/** + * @file d_a_obj_key.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_key/d_a_obj_key.h" #include "dol2asm.h" +#include "rel/d/a/obj/d_a_obj_smallkey/d_a_obj_smallkey.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_key_class {}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; - /* 80C3FB84 */ ~cXyz(); - /* 80C40F24 */ cXyz(); -}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static f32 mGroundY; -}; - -struct daObj_Key_HIO_c { - /* 80C3F40C */ daObj_Key_HIO_c(); - /* 80C40F28 */ ~daObj_Key_HIO_c(); -}; - -struct daKey_c { - /* 80C40FBC */ void setPos(cXyz); -}; - -struct dSv_memBit_c { - /* 80034934 */ void isDungeonItem(int) const; -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz { - /* 80C40EE4 */ ~csXyz(); - /* 80C40F20 */ csXyz(); -}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80C40E74 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); -}; - -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGSph { - /* 80C40DE4 */ ~cM3dGSph(); -}; - -struct cM3dGAab { - /* 80C40E2C */ ~cM3dGAab(); -}; -struct cBgS_GndChk { - /* 80267D0C */ void SetPos(Vec const*); -}; - -struct cBgS { - /* 800744A0 */ void GroundCross(cBgS_GndChk*); -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDFF8 */ void deleteObject(); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -244,9 +99,6 @@ extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void deleteObject__14Z2SoundObjBaseFv(); extern "C" void __ct__16Z2SoundObjSimpleFv(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSVECAdd(); -extern "C" void PSVECSquareMag(); extern "C" void __construct_array(); extern "C" void _savegpr_20(); extern "C" void _savegpr_22(); @@ -260,20 +112,15 @@ extern "C" void _restgpr_24(); extern "C" void _restgpr_25(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); -extern "C" void strcmp(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 g_Counter[12 + 4 /* padding */]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -300,25 +147,30 @@ SECTION_DATA static u8 key_eno[4] = { }; /* 80C41098-80C410B8 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Key_Method */ -SECTION_DATA static void* l_daObj_Key_Method[8] = { - (void*)daObj_Key_Create__FP10fopAc_ac_c, - (void*)daObj_Key_Delete__FP13obj_key_class, - (void*)daObj_Key_Execute__FP13obj_key_class, - (void*)daObj_Key_IsDelete__FP13obj_key_class, - (void*)daObj_Key_Draw__FP13obj_key_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObj_Key_Method = { + (process_method_func)daObj_Key_Create__FP10fopAc_ac_c, + (process_method_func)daObj_Key_Delete__FP13obj_key_class, + (process_method_func)daObj_Key_Execute__FP13obj_key_class, + (process_method_func)daObj_Key_IsDelete__FP13obj_key_class, + (process_method_func)daObj_Key_Draw__FP13obj_key_class, }; /* 80C410B8-80C410E8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_KEY */ -SECTION_DATA extern void* g_profile_OBJ_KEY[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01130000, (void*)&g_fpcLf_Method, - (void*)0x000009B8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x002C0000, (void*)&l_daObj_Key_Method, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_KEY = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_KEY, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(obj_key_class), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 44, // mPriority + &l_daObj_Key_Method, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C410E8-80C410F4 000054 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGSph */ @@ -512,7 +364,8 @@ static asm void chain_control_00(obj_key_class* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_key/d_a_obj_key/__dt__4cXyzFv.s" } @@ -762,7 +615,8 @@ static asm void daObj_Key_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { +// asm cM3dGSph::~cM3dGSph() { +extern "C" asm void __dt__8cM3dGSphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_key/d_a_obj_key/__dt__8cM3dGSphFv.s" } @@ -772,7 +626,8 @@ asm cM3dGSph::~cM3dGSph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_key/d_a_obj_key/__dt__8cM3dGAabFv.s" } @@ -782,7 +637,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_key/d_a_obj_key/__dt__12dBgS_ObjAcchFv.s" } @@ -792,19 +648,22 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm csXyz::~csXyz() { +// asm csXyz::~csXyz() { +extern "C" asm void __dt__5csXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_key/d_a_obj_key/__dt__5csXyzFv.s" } #pragma pop /* 80C40F20-80C40F24 001C00 0004+00 1/1 0/0 0/0 .text __ct__5csXyzFv */ -csXyz::csXyz() { +// csXyz::csXyz() { +extern "C" asm void __ct__5csXyzFv() { /* empty function */ } /* 80C40F24-80C40F28 001C04 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */ -cXyz::cXyz() { +// cXyz::cXyz() { +extern "C" asm void __ct__4cXyzFv() { /* empty function */ } @@ -857,7 +716,8 @@ static asm void func_80C40FB4() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daKey_c::setPos(cXyz param_0) { +// asm void daKey_c::setPos(cXyz param_0) { +extern "C" asm void setPos__7daKey_cF4cXyz() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_key/d_a_obj_key/setPos__7daKey_cF4cXyz.s" } diff --git a/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.cpp b/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.cpp index af9867105a7..1076d7b7c29 100644 --- a/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.cpp +++ b/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.cpp @@ -1,63 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_keyhole -// +/** + * @file d_a_obj_keyhole.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct kh_chain_s { - /* 80C436A0 */ ~kh_chain_s(); - /* 80C437A4 */ kh_chain_s(); -}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - static f32 mGroundY; -}; - -struct daObj_Keyhole_HIO_c { - /* 80C4124C */ daObj_Keyhole_HIO_c(); - /* 80C4394C */ ~daObj_Keyhole_HIO_c(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dComIfG_play_c { - /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); - /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); - /* 8002CB68 */ void entrySimpleModel(J3DModel*, int); -}; - -struct dCcU_AtInfo {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); - /* 802C06F4 */ void stopAnime(); -}; // // Forward References: @@ -297,25 +247,30 @@ static dCcD_SrcSph cc_sph_src = { }; /* 80C43C14-80C43C34 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Keyhole_Method */ -SECTION_DATA static void* l_daObj_Keyhole_Method[8] = { - (void*)daObj_Keyhole_Create__FP10fopAc_ac_c, - (void*)daObj_Keyhole_Delete__FP17obj_keyhole_class, - (void*)daObj_Keyhole_Execute__FP17obj_keyhole_class, - (void*)daObj_Keyhole_IsDelete__FP17obj_keyhole_class, - (void*)daObj_Keyhole_Draw__FP17obj_keyhole_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObj_Keyhole_Method = { + (process_method_func)daObj_Keyhole_Create__FP10fopAc_ac_c, + (process_method_func)daObj_Keyhole_Delete__FP17obj_keyhole_class, + (process_method_func)daObj_Keyhole_Execute__FP17obj_keyhole_class, + (process_method_func)daObj_Keyhole_IsDelete__FP17obj_keyhole_class, + (process_method_func)daObj_Keyhole_Draw__FP17obj_keyhole_class, }; /* 80C43C34-80C43C64 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_KEYHOLE */ -SECTION_DATA extern void* g_profile_OBJ_KEYHOLE[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01140000, (void*)&g_fpcLf_Method, - (void*)0x00002CB8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x002D0000, (void*)&l_daObj_Keyhole_Method, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_KEYHOLE = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_KEYHOLE, // mProcName + &g_fpcLf_Method.mBase, // sub_method + 0x00002CB8, // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 45, // mPriority + &l_daObj_Keyhole_Method, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C43C64-80C43C70 000178 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */ diff --git a/rel/d/a/obj/d_a_obj_kiPot/d_a_obj_kiPot.cpp b/rel/d/a/obj/d_a_obj_kiPot/d_a_obj_kiPot.cpp index 49f3c16a3fe..c7762814e47 100644 --- a/rel/d/a/obj/d_a_obj_kiPot/d_a_obj_kiPot.cpp +++ b/rel/d/a/obj/d_a_obj_kiPot/d_a_obj_kiPot.cpp @@ -1,47 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_kiPot -// +/** + * @file d_a_obj_kiPot.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_kiPot/d_a_obj_kiPot.h" #include "dol2asm.h" -// -// Types: -// - -struct mDoMtx_stack_c { - static u8 now[48]; -}; -struct mDoHIO_entry_c { - /* 80C44D30 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daKiPot_c { - /* 80C44D78 */ void setBaseMtx(); - /* 80C44DD0 */ void create(); - /* 80C44E7C */ void Execute(); - /* 80C44EF8 */ void procMain(); - /* 80C44F74 */ void init_modeWait(); - /* 80C44F80 */ void modeWait(); - /* 80C45008 */ void chkEvent(); - /* 80C45058 */ bool Draw(); - /* 80C45060 */ bool Delete(); -}; - -struct daKiPot_HIO_c { - /* 80C44D0C */ daKiPot_HIO_c(); - /* 80C450E8 */ ~daKiPot_HIO_c(); -}; - -struct dAttCatch_c { - /* 80073A08 */ void request(fopAc_ac_c*, u8, f32, f32, f32, s16, int); -}; // // Forward References: @@ -74,10 +39,7 @@ extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); extern "C" void request__11dAttCatch_cFP10fopAc_ac_cUcfffsi(); extern "C" void __dl__FPv(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __register_global_object(); @@ -106,25 +68,30 @@ SECTION_DATA static u8 mode_proc[12] = { }; /* 80C451D4-80C451F4 -00001 0020+00 1/0 0/0 0/0 .data l_daKiPot_Method */ -SECTION_DATA static void* l_daKiPot_Method[8] = { - (void*)daKiPot_Create__FP10fopAc_ac_c, - (void*)daKiPot_Delete__FP9daKiPot_c, - (void*)daKiPot_Execute__FP9daKiPot_c, - (void*)NULL, - (void*)daKiPot_Draw__FP9daKiPot_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daKiPot_Method = { + (process_method_func)daKiPot_Create__FP10fopAc_ac_c, + (process_method_func)daKiPot_Delete__FP9daKiPot_c, + (process_method_func)daKiPot_Execute__FP9daKiPot_c, + 0, + (process_method_func)daKiPot_Draw__FP9daKiPot_c, }; /* 80C451F4-80C45224 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_KiPot */ -SECTION_DATA extern void* g_profile_Obj_KiPot[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x016D0000, (void*)&g_fpcLf_Method, - (void*)0x00000578, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02050000, (void*)&l_daKiPot_Method, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_KiPot = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_KiPot, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daKiPot_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 517, // mPriority + &l_daKiPot_Method, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C45224-80C45230 000080 000C+00 2/2 0/0 0/0 .data __vt__13daKiPot_HIO_c */ @@ -155,7 +122,8 @@ asm daKiPot_HIO_c::daKiPot_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kiPot/d_a_obj_kiPot/__dt__14mDoHIO_entry_cFv.s" } diff --git a/rel/d/a/obj/d_a_obj_kita/d_a_obj_kita.cpp b/rel/d/a/obj/d_a_obj_kita/d_a_obj_kita.cpp index 61372099cc5..3af0f48596e 100644 --- a/rel/d/a/obj/d_a_obj_kita/d_a_obj_kita.cpp +++ b/rel/d/a/obj/d_a_obj_kita/d_a_obj_kita.cpp @@ -1,101 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_kita -// +/** + * @file d_a_obj_kita.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_kita/d_a_obj_kita.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_kita_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct kita_s { - /* 80C45E44 */ ~kita_s(); - /* 80C45E80 */ kita_s(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObj_Kita_HIO_c { - /* 80C4534C */ daObj_Kita_HIO_c(); - /* 80C45E84 */ ~daObj_Kita_HIO_c(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct Vec {}; - -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; -}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; -struct csXyz {}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS_PolyInfo {}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -154,8 +66,6 @@ extern "C" void MtxPosition__FP4cXyzP4cXyz(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __construct_array(); extern "C" void _savegpr_21(); extern "C" void _savegpr_23(); @@ -167,11 +77,8 @@ extern "C" void _restgpr_23(); extern "C" void _restgpr_25(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -208,25 +115,30 @@ COMPILER_STRIP_GATE(0x80C45F28, &lit_3772); #pragma pop /* 80C45F8C-80C45FAC -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Kita_Method */ -SECTION_DATA static void* l_daObj_Kita_Method[8] = { - (void*)daObj_Kita_Create__FP10fopAc_ac_c, - (void*)daObj_Kita_Delete__FP14obj_kita_class, - (void*)daObj_Kita_Execute__FP14obj_kita_class, - (void*)daObj_Kita_IsDelete__FP14obj_kita_class, - (void*)daObj_Kita_Draw__FP14obj_kita_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObj_Kita_Method = { + (process_method_func)daObj_Kita_Create__FP10fopAc_ac_c, + (process_method_func)daObj_Kita_Delete__FP14obj_kita_class, + (process_method_func)daObj_Kita_Execute__FP14obj_kita_class, + (process_method_func)daObj_Kita_IsDelete__FP14obj_kita_class, + (process_method_func)daObj_Kita_Draw__FP14obj_kita_class, }; /* 80C45FAC-80C45FDC -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_KITA */ -SECTION_DATA extern void* g_profile_OBJ_KITA[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01120000, (void*)&g_fpcLf_Method, - (void*)0x00000D78, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02C30000, (void*)&l_daObj_Kita_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_KITA = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_KITA, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(obj_kita_class), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 707, // mPriority + &l_daObj_Kita_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C45FDC-80C45FE8 000050 000C+00 2/2 0/0 0/0 .data __vt__16daObj_Kita_HIO_c */ diff --git a/rel/d/a/obj/d_a_obj_klift00/d_a_obj_klift00.cpp b/rel/d/a/obj/d_a_obj_klift00/d_a_obj_klift00.cpp index 1fc22a2b020..eed6eb3ac97 100644 --- a/rel/d/a/obj/d_a_obj_klift00/d_a_obj_klift00.cpp +++ b/rel/d/a/obj/d_a_obj_klift00/d_a_obj_klift00.cpp @@ -1,94 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_klift00 -// +/** + * @file d_a_obj_klift00.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_klift00/d_a_obj_klift00.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjKLift00_c { - struct ChainPos { - /* 8058C338 */ ~ChainPos(); - /* 8058C374 */ ChainPos(); - }; - - /* 8058B02C */ void create1st(); - /* 8058B0D0 */ void setMtx(); - /* 8058B4B0 */ void rideActor(fopAc_ac_c*); - /* 8058B5EC */ void CreateHeap(); - /* 8058B77C */ void Create(); - /* 8058B97C */ void Execute(f32 (**)[3][4]); - /* 8058BEEC */ void Draw(); - /* 8058C014 */ void Delete(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dMdl_obj_c { - /* 8058C32C */ dMdl_obj_c(); -}; - -struct dMdl_mng_c { - /* 8009C8D8 */ void entry(J3DModelData*, u16, int); -}; - -struct dMdl_c { - /* 8009C668 */ void entryObj(dMdl_obj_c*); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct J3DModel {}; // // Forward References: @@ -167,11 +85,6 @@ extern "C" void SetC__8cM3dGSphFRC4cXyz(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nwa__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXIdentity(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXConcat(); -extern "C" void PSMTXRotAxisRad(); -extern "C" void PSMTXTrans(); extern "C" void __construct_array(); extern "C" void __construct_new_array(); extern "C" void _savegpr_22(); @@ -182,8 +95,6 @@ extern "C" void _restgpr_22(); extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -193,10 +104,8 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" f32 Zero__4cXyz[3]; extern "C" u8 BaseZ__4cXyz[12]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // @@ -253,25 +162,30 @@ static dCcD_SrcCyl l_cc_cyl_src = { }; /* 8058C47C-8058C49C -00001 0020+00 1/0 0/0 0/0 .data daObjKLift00_METHODS */ -SECTION_DATA static void* daObjKLift00_METHODS[8] = { - (void*)daObjKLift00_create1st__FP14daObjKLift00_c, - (void*)daObjKLift00_MoveBGDelete__FP14daObjKLift00_c, - (void*)daObjKLift00_MoveBGExecute__FP14daObjKLift00_c, - (void*)NULL, - (void*)daObjKLift00_MoveBGDraw__FP14daObjKLift00_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjKLift00_METHODS = { + (process_method_func)daObjKLift00_create1st__FP14daObjKLift00_c, + (process_method_func)daObjKLift00_MoveBGDelete__FP14daObjKLift00_c, + (process_method_func)daObjKLift00_MoveBGExecute__FP14daObjKLift00_c, + 0, + (process_method_func)daObjKLift00_MoveBGDraw__FP14daObjKLift00_c, }; /* 8058C49C-8058C4CC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_KLift00 */ -SECTION_DATA extern void* g_profile_Obj_KLift00[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00D10000, (void*)&g_fpcLf_Method, - (void*)0x00001160, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02A10000, (void*)&daObjKLift00_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_KLift00 = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_KLift00, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjKLift00_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 673, // mPriority + &daObjKLift00_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 8058C4CC-8058C4F4 0000D8 0028+00 1/1 0/0 0/0 .data __vt__14daObjKLift00_c */ @@ -650,7 +564,8 @@ static asm void daObjKLift00_MoveBGDraw(daObjKLift00_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dMdl_obj_c::dMdl_obj_c() { +// asm dMdl_obj_c::dMdl_obj_c() { +extern "C" asm void __ct__10dMdl_obj_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_klift00/d_a_obj_klift00/__ct__10dMdl_obj_cFv.s" } diff --git a/rel/d/a/obj/d_a_obj_knBullet/d_a_obj_knBullet.cpp b/rel/d/a/obj/d_a_obj_knBullet/d_a_obj_knBullet.cpp index d52caf638f8..3f26d342aaf 100644 --- a/rel/d/a/obj/d_a_obj_knBullet/d_a_obj_knBullet.cpp +++ b/rel/d/a/obj/d_a_obj_knBullet/d_a_obj_knBullet.cpp @@ -1,65 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_knBullet -// +/** + * @file d_a_obj_knBullet.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_knBullet/d_a_obj_knBullet.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CED4 */ void XYZrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObjKnBullet_c { - /* 80C47118 */ void Create(); - /* 80C47300 */ void Execute(); - /* 80C47480 */ bool Draw(); - /* 80C47488 */ bool Delete(); - /* 80C47490 */ void setBaseMtx(); - /* 80C474E8 */ void col_init(); - /* 80C47558 */ void col_chk(); - /* 80C477B4 */ void hitPrtclSet(); -}; - -struct dPa_levelEcallBack {}; - -struct dKy_tevstr_c {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct JPABaseEmitter { - /* 8027EC60 */ void deleteAllParticle(); -}; // // Forward References: @@ -112,17 +59,12 @@ extern "C" void SetR__8cM3dGSphFf(); extern "C" void deleteAllParticle__14JPABaseEmitterFv(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void _savegpr_24(); extern "C" void _savegpr_26(); extern "C" void _savegpr_29(); extern "C" void _restgpr_24(); extern "C" void _restgpr_26(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; @@ -185,25 +127,30 @@ COMPILER_STRIP_GATE(0x80C479A8, &lit_3910); #pragma pop /* 80C479CC-80C479EC -00001 0020+00 1/0 0/0 0/0 .data l_daObjKnBullet_Method */ -SECTION_DATA static void* l_daObjKnBullet_Method[8] = { - (void*)daObjKnBullet_create__FP10fopAc_ac_c, - (void*)daObjKnBullet_Delete__FP15daObjKnBullet_c, - (void*)daObjKnBullet_Execute__FP15daObjKnBullet_c, - (void*)daObjKnBullet_IsDelete__FP15daObjKnBullet_c, - (void*)daObjKnBullet_Draw__FP15daObjKnBullet_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjKnBullet_Method = { + (process_method_func)daObjKnBullet_create__FP10fopAc_ac_c, + (process_method_func)daObjKnBullet_Delete__FP15daObjKnBullet_c, + (process_method_func)daObjKnBullet_Execute__FP15daObjKnBullet_c, + (process_method_func)daObjKnBullet_IsDelete__FP15daObjKnBullet_c, + (process_method_func)daObjKnBullet_Draw__FP15daObjKnBullet_c, }; /* 80C479EC-80C47A1C -00001 0030+00 0/0 0/0 1/0 .data g_profile_KN_BULLET */ -SECTION_DATA extern void* g_profile_KN_BULLET[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x025B0000, (void*)&g_fpcLf_Method, - (void*)0x0000071C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x015C0000, (void*)&l_daObjKnBullet_Method, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_KN_BULLET = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_KN_BULLET, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjKnBullet_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 348, // mPriority + &l_daObjKnBullet_Method, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C47A1C-80C47A28 000050 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGSph */ diff --git a/rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter.cpp b/rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter.cpp index 75c9230e3f6..b71a90edb6f 100644 --- a/rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter.cpp +++ b/rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter.cpp @@ -1,189 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_kshutter -// +/** + * @file d_a_obj_kshutter.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266EF4 */ void normalize(); -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c {}; - -struct daObjKshtr_c { - /* 80C47AB8 */ void initBaseMtx(); - /* 80C47B2C */ void setBaseMtx(); - /* 80C47C14 */ void Create(); - /* 80C47E54 */ void offDzb(); - /* 80C47EA8 */ void CreateHeap(); - /* 80C48050 */ void initKey(); - /* 80C48148 */ void phase_0(); - /* 80C4827C */ void phase_1(); - /* 80C48320 */ s32 phase_2(); - /* 80C48328 */ void create1st(); - /* 80C483CC */ void event_proc_call(); - /* 80C48470 */ void event_proc_call2(); - /* 80C4852C */ void Execute(f32 (**)[3][4]); - /* 80C48590 */ void checkArea(); - /* 80C48708 */ void checkOpen(); - /* 80C48798 */ void getDemoAction(); - /* 80C487E0 */ void demoProc2(); - /* 80C489E0 */ void adjustmentProc(); - /* 80C48AC8 */ void keyUnlockInit(); - /* 80C48B84 */ void keyUnlock(); - /* 80C48BD8 */ void openInit(); - /* 80C48D0C */ void openProc(); - /* 80C48D80 */ void openProc_type1(); - /* 80C48F94 */ void openProc_type2(); - /* 80C490F8 */ void openProc_typeL3Boss(); - /* 80C49158 */ void demoProc(); - /* 80C4925C */ void demoJail1(); - /* 80C494A8 */ void demoJail2(); - /* 80C495A4 */ void demoJail11(); - /* 80C496C8 */ bool demoJail21(); - /* 80C496D0 */ void anmInit(); - /* 80C497A0 */ void actionWaitEvent(); - /* 80C49880 */ void actionEvent(); - /* 80C49914 */ void actionDead(); - /* 80C49918 */ void actionWaitEvent2(); - /* 80C499CC */ void actionOpen(); - /* 80C49A08 */ void actionEvent2(); - /* 80C49A70 */ void actionDead2(); - /* 80C49A74 */ void Draw(); - /* 80C49B4C */ void Delete(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_memBit_c { - /* 80034934 */ void isDungeonItem(int) const; -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dEvent_manager_c { - /* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8); - /* 80047698 */ void getEventIdx(fopAc_ac_c*, u8); - /* 80047A78 */ void endCheck(s16); - /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int); - /* 80047D4C */ void getIsAddvance(int); - /* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int); - /* 800480EC */ void getMySubstanceP(int, char const*, int); - /* 8004817C */ void cutEnd(int); -}; - -struct dBgW_Base {}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80C48008 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -293,9 +115,6 @@ extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSVECSquareMag(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_25(); extern "C" void _savegpr_27(); @@ -305,14 +124,9 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void abs(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 struct_80C4A0E8[4]; @@ -726,25 +540,30 @@ SECTION_DATA static u8 l_demoProc2[24] = { #pragma pop /* 80C4A060-80C4A080 -00001 0020+00 1/0 0/0 0/0 .data daObjKshtr_METHODS */ -SECTION_DATA static void* daObjKshtr_METHODS[8] = { - (void*)daObjKshtr_create1st__FP12daObjKshtr_c, - (void*)daObjKshtr_MoveBGDelete__FP12daObjKshtr_c, - (void*)daObjKshtr_MoveBGExecute__FP12daObjKshtr_c, - (void*)NULL, - (void*)daObjKshtr_MoveBGDraw__FP12daObjKshtr_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjKshtr_METHODS = { + (process_method_func)daObjKshtr_create1st__FP12daObjKshtr_c, + (process_method_func)daObjKshtr_MoveBGDelete__FP12daObjKshtr_c, + (process_method_func)daObjKshtr_MoveBGExecute__FP12daObjKshtr_c, + 0, + (process_method_func)daObjKshtr_MoveBGDraw__FP12daObjKshtr_c, }; /* 80C4A080-80C4A0B0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Kshutter */ -SECTION_DATA extern void* g_profile_Obj_Kshutter[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00550000, (void*)&g_fpcLf_Method, - (void*)0x00000620, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01BB0000, (void*)&daObjKshtr_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Kshutter = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Kshutter, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjKshtr_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 443, // mPriority + &daObjKshtr_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C4A0B0-80C4A0BC 000250 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ @@ -768,7 +587,8 @@ asm void daObjKshtr_c::CreateHeap() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_ktOnFire/d_a_obj_ktOnFire.cpp b/rel/d/a/obj/d_a_obj_ktOnFire/d_a_obj_ktOnFire.cpp index 162a0160446..b23739c0c5f 100644 --- a/rel/d/a/obj/d_a_obj_ktOnFire/d_a_obj_ktOnFire.cpp +++ b/rel/d/a/obj/d_a_obj_ktOnFire/d_a_obj_ktOnFire.cpp @@ -1,119 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_ktOnFire -// +/** + * @file d_a_obj_ktOnFire.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_ktOnFire/d_a_obj_ktOnFire.h" #include "dol2asm.h" -// -// Types: -// - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 8058C630 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daKtOnFire_c { - /* 8058C678 */ void setBaseMtx(); - /* 8058C6D0 */ void create(); - /* 8058C960 */ void lightInit(); - /* 8058C9D4 */ void setLight(); - /* 8058C9F8 */ void cutLight(); - /* 8058CA1C */ void Execute(); - /* 8058CDF8 */ bool Draw(); - /* 8058CE00 */ void Delete(); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; -}; - -struct daKtOnFire_HIO_c { - /* 8058C60C */ daKtOnFire_HIO_c(); - /* 8058CEA8 */ ~daKtOnFire_HIO_c(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 800352B0 */ void offSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dPa_levelEcallBack {}; - -struct dKy_tevstr_c {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct cXyz {}; - -struct dPa_control_c { - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 80084548 */ void GetTgHitGObj(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 8058C8D0 */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 8058C918 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct LIGHT_INFLUENCE {}; // // Forward References: @@ -168,11 +61,8 @@ extern "C" void SetR__8cM3dGCylFf(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXTrans(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -204,25 +94,30 @@ SECTION_DATA u8 daKtOnFire_c::mCcDCyl[68] = { }; /* 8058D038-8058D058 -00001 0020+00 1/0 0/0 0/0 .data l_daKtOnFire_Method */ -SECTION_DATA static void* l_daKtOnFire_Method[8] = { - (void*)daKtOnFire_Create__FP10fopAc_ac_c, - (void*)daKtOnFire_Delete__FP12daKtOnFire_c, - (void*)daKtOnFire_Execute__FP12daKtOnFire_c, - (void*)NULL, - (void*)daKtOnFire_Draw__FP12daKtOnFire_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daKtOnFire_Method = { + (process_method_func)daKtOnFire_Create__FP10fopAc_ac_c, + (process_method_func)daKtOnFire_Delete__FP12daKtOnFire_c, + (process_method_func)daKtOnFire_Execute__FP12daKtOnFire_c, + 0, + (process_method_func)daKtOnFire_Draw__FP12daKtOnFire_c, }; /* 8058D058-8058D088 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_KtOnFire */ -SECTION_DATA extern void* g_profile_Tag_KtOnFire[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01680000, (void*)&g_fpcLf_Method, - (void*)0x00000728, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01F60000, (void*)&l_daKtOnFire_Method, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Tag_KtOnFire = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Tag_KtOnFire, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daKtOnFire_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 502, // mPriority + &l_daKtOnFire_Method, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 8058D088-8058D094 0000AC 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ @@ -267,7 +162,8 @@ asm daKtOnFire_HIO_c::daKtOnFire_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ktOnFire/d_a_obj_ktOnFire/__dt__14mDoHIO_entry_cFv.s" } @@ -320,7 +216,8 @@ asm void daKtOnFire_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ktOnFire/d_a_obj_ktOnFire/__dt__8cM3dGCylFv.s" } @@ -330,7 +227,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ktOnFire/d_a_obj_ktOnFire/__dt__8cM3dGAabFv.s" } diff --git a/rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata.cpp b/rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata.cpp index 7052f01959f..0813df42dcb 100644 --- a/rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata.cpp +++ b/rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata.cpp @@ -1,213 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_kuwagata -// +/** + * @file d_a_obj_kuwagata.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF0C */ void ZXYrotS(csXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; - -struct mDoExt_McaMorfSO { - /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, - int, Z2Creature*, u32, u32); - /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32); - /* 800110B0 */ void play(u32, s8); - /* 800111C0 */ void entryDL(); - /* 800111EC */ void modelCalc(); - /* 80011310 */ void stopZelAnime(); -}; - -struct fopAc_ac_c {}; - -struct daPy_boomerangMove_c { - /* 8015E5B0 */ void initOffset(cXyz const*); - /* 8015E654 */ void posMove(cXyz*, s16*, fopAc_ac_c*, s16); - /* 8015E87C */ void bgCheckAfterOffset(cXyz const*); -}; - -struct daObj_KuwHIO_c { - /* 80C4A1EC */ daObj_KuwHIO_c(); - /* 80C4D3E8 */ ~daObj_KuwHIO_c(); -}; - -struct daObjKUW_c { - /* 80C4A21C */ void InitCcSph(); - /* 80C4A288 */ void SetCcSph(); - /* 80C4A300 */ void CreateHeap(); - /* 80C4A6E4 */ void ShopWaitAction(); - /* 80C4A84C */ void WaitAction(); - /* 80C4A9D0 */ void WallCheck(); - /* 80C4AC44 */ void SpeedSet(); - /* 80C4AD50 */ void WallWalk(); - /* 80C4B1A0 */ void WalkAction(); - /* 80C4B3A0 */ void MoveAction(); - /* 80C4BB88 */ void Action(); - /* 80C4BC4C */ void ShopAction(); - /* 80C4BD08 */ void Insect_Release(); - /* 80C4BD20 */ void Z_BufferChk(); - /* 80C4BE9C */ void ParticleSet(); - /* 80C4BFC0 */ void BoomChk(); - /* 80C4C38C */ void ObjHit(); - /* 80C4C514 */ void Execute(); - /* 80C4C78C */ void Delete(); - /* 80C4C7F4 */ void setBaseMtx(); - /* 80C4C95C */ void CreateChk(); - /* 80C4CB08 */ void create(); -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dMenu_Insect_c { - /* 801D9F3C */ void isCatchNotGiveInsect(u8); -}; - -struct dInsect_c { - /* 8015E010 */ dInsect_c(); - /* 8015E078 */ void Insect_GetDemoMain(); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dDlst_peekZ_c { - /* 80056018 */ void newData(s16, s16, u32*); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80C4D2E0 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); -}; - -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_PolyInfo {}; - -struct cBgS_LinChk {}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; -struct _GXTexObj {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80C4A658 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -334,16 +134,12 @@ extern "C" void init__10Z2CreatureFP3VecP3VecUcUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void _savegpr_24(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_24(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -353,7 +149,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" void __register_global_object(); // @@ -370,25 +165,30 @@ SECTION_RODATA static f32 const lit_3776 = 6.0f / 5.0f; COMPILER_STRIP_GATE(0x80C4D494, &lit_3776); /* 80C4D59C-80C4D5BC -00001 0020+00 1/0 0/0 0/0 .data l_daObjKUW_Method */ -SECTION_DATA static void* l_daObjKUW_Method[8] = { - (void*)daObjKUW_Create__FP10fopAc_ac_c, - (void*)daObjKUW_Delete__FP10daObjKUW_c, - (void*)daObjKUW_Execute__FP10daObjKUW_c, - (void*)daObjKUW_IsDelete__FP10daObjKUW_c, - (void*)daObjKUW_Draw__FP10daObjKUW_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjKUW_Method = { + (process_method_func)daObjKUW_Create__FP10fopAc_ac_c, + (process_method_func)daObjKUW_Delete__FP10daObjKUW_c, + (process_method_func)daObjKUW_Execute__FP10daObjKUW_c, + (process_method_func)daObjKUW_IsDelete__FP10daObjKUW_c, + (process_method_func)daObjKUW_Draw__FP10daObjKUW_c, }; /* 80C4D5BC-80C4D5EC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Kuw */ -SECTION_DATA extern void* g_profile_Obj_Kuw[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01420000, (void*)&g_fpcLf_Method, - (void*)0x00000A68, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01DF0000, (void*)&l_daObjKUW_Method, - (void*)0x000C0100, (void*)0x030E0000, +extern actor_process_profile_definition g_profile_Obj_Kuw = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Kuw, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjKUW_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 479, // mPriority + &l_daObjKUW_Method, // sub_method + 0x000C0100, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C4D5EC-80C4D610 000050 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ @@ -530,7 +330,8 @@ asm void daObjKUW_c::CreateHeap() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata/__dt__12J3DFrameCtrlFv.s" } @@ -1078,7 +879,8 @@ asm void daObjKUW_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_kwheel00/d_a_obj_kwheel00.cpp b/rel/d/a/obj/d_a_obj_kwheel00/d_a_obj_kwheel00.cpp index 96f8a1d123a..f142fb5e93f 100644 --- a/rel/d/a/obj/d_a_obj_kwheel00/d_a_obj_kwheel00.cpp +++ b/rel/d/a/obj/d_a_obj_kwheel00/d_a_obj_kwheel00.cpp @@ -1,102 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_kwheel00 -// +/** + * @file d_a_obj_kwheel00.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_kwheel00/d_a_obj_kwheel00.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjKWheel00_c { - /* 80C4D6F8 */ void create1st(); - /* 80C4D86C */ void setMtx(); - /* 80C4D9B8 */ void CreateHeap(); - /* 80C4DA38 */ void Create(); - /* 80C4DBBC */ void Execute(f32 (**)[3][4]); - /* 80C4E1B0 */ void Draw(); - /* 80C4E254 */ void Delete(); - /* 80C4E298 */ void eventStart(); - /* 80C4E6E4 */ ~daObjKWheel00_c(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dEvLib_callback_c { - /* 8004886C */ void eventUpdate(); - /* 80048940 */ void orderEvent(int, int, int); - /* 80C4E684 */ ~dEvLib_callback_c(); - /* 80C4E6CC */ bool eventStart(); - /* 80C4E6D4 */ bool eventRun(); - /* 80C4E6DC */ bool eventEnd(); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct J3DModel {}; // // Forward References: @@ -173,17 +83,12 @@ extern "C" void SetR__8cM3dGSphFf(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void _savegpr_21(); extern "C" void _savegpr_27(); extern "C" void _restgpr_21(); extern "C" void _restgpr_27(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -192,8 +97,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // @@ -400,25 +303,30 @@ asm void daObjKWheel00_c::eventStart() { /* ############################################################################################## */ /* 80C4E920-80C4E940 -00001 0020+00 1/0 0/0 0/0 .data daObjKWheel00_METHODS */ -SECTION_DATA static void* daObjKWheel00_METHODS[8] = { - (void*)daObjKWheel00_create1st__FP15daObjKWheel00_c, - (void*)daObjKWheel00_MoveBGDelete__FP15daObjKWheel00_c, - (void*)daObjKWheel00_MoveBGExecute__FP15daObjKWheel00_c, - (void*)NULL, - (void*)daObjKWheel00_MoveBGDraw__FP15daObjKWheel00_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjKWheel00_METHODS = { + (process_method_func)daObjKWheel00_create1st__FP15daObjKWheel00_c, + (process_method_func)daObjKWheel00_MoveBGDelete__FP15daObjKWheel00_c, + (process_method_func)daObjKWheel00_MoveBGExecute__FP15daObjKWheel00_c, + 0, + (process_method_func)daObjKWheel00_MoveBGDraw__FP15daObjKWheel00_c, }; /* 80C4E940-80C4E970 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_KWheel00 */ -SECTION_DATA extern void* g_profile_Obj_KWheel00[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00C70000, (void*)&g_fpcLf_Method, - (void*)0x00000B44, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02960000, (void*)&daObjKWheel00_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_KWheel00 = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_KWheel00, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjKWheel00_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 662, // mPriority + &daObjKWheel00_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C4E970-80C4E97C 000100 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -595,7 +503,8 @@ extern "C" asm void __dt__10cCcD_GSttsFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dEvLib_callback_c::~dEvLib_callback_c() { +// asm dEvLib_callback_c::~dEvLib_callback_c() { +extern "C" asm void __dt__17dEvLib_callback_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kwheel00/d_a_obj_kwheel00/__dt__17dEvLib_callback_cFv.s" } @@ -603,17 +512,20 @@ asm dEvLib_callback_c::~dEvLib_callback_c() { /* 80C4E6CC-80C4E6D4 00104C 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventStart() { +// bool dEvLib_callback_c::eventStart()() { +extern "C" bool eventStart__17dEvLib_callback_cFv() { return true; } /* 80C4E6D4-80C4E6DC 001054 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventRun() { +// bool dEvLib_callback_c::eventRun() { +extern "C" bool eventRun__17dEvLib_callback_cFv() { return true; } /* 80C4E6DC-80C4E6E4 00105C 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventEnd() { +// bool dEvLib_callback_c::eventEnd() { +extern "C" bool eventEnd__17dEvLib_callback_cFv() { return true; } diff --git a/rel/d/a/obj/d_a_obj_kwheel01/d_a_obj_kwheel01.cpp b/rel/d/a/obj/d_a_obj_kwheel01/d_a_obj_kwheel01.cpp index bf41b955fc6..1159931f875 100644 --- a/rel/d/a/obj/d_a_obj_kwheel01/d_a_obj_kwheel01.cpp +++ b/rel/d/a/obj/d_a_obj_kwheel01/d_a_obj_kwheel01.cpp @@ -1,128 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_kwheel01 -// +/** + * @file d_a_obj_kwheel01.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_kwheel01/d_a_obj_kwheel01.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjKWheel01_c { - /* 80C4EA78 */ void create1st(); - /* 80C4EC54 */ void setMtx(); - /* 80C4EDCC */ void CreateHeap(); - /* 80C4EF38 */ void Create(); - /* 80C4F048 */ void Execute(f32 (**)[3][4]); - /* 80C4F344 */ void Draw(); - /* 80C4F3E8 */ void Delete(); - /* 80C4F498 */ void eventStart(); - /* 80C4F60C */ ~daObjKWheel01_c(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dEvent_manager_c { - /* 80047698 */ void getEventIdx(fopAc_ac_c*, u8); -}; - -struct dEvLib_callback_c { - /* 8004886C */ void eventUpdate(); - /* 800488A4 */ void setEvent(int, int, int); - /* 80C4F5AC */ ~dEvLib_callback_c(); - /* 80C4F5F4 */ bool eventStart(); - /* 80C4F5FC */ bool eventRun(); - /* 80C4F604 */ bool eventEnd(); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -192,9 +75,6 @@ extern "C" void ChkUsed__9cBgW_BgIdCFv(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void _savegpr_25(); extern "C" void _savegpr_26(); extern "C" void _savegpr_27(); @@ -203,13 +83,9 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // @@ -354,25 +230,30 @@ asm void daObjKWheel01_c::eventStart() { /* ############################################################################################## */ /* 80C4F72C-80C4F74C -00001 0020+00 1/0 0/0 0/0 .data daObjKWheel01_METHODS */ -SECTION_DATA static void* daObjKWheel01_METHODS[8] = { - (void*)daObjKWheel01_create1st__FP15daObjKWheel01_c, - (void*)daObjKWheel01_MoveBGDelete__FP15daObjKWheel01_c, - (void*)daObjKWheel01_MoveBGExecute__FP15daObjKWheel01_c, - (void*)NULL, - (void*)daObjKWheel01_MoveBGDraw__FP15daObjKWheel01_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjKWheel01_METHODS = { + (process_method_func)daObjKWheel01_create1st__FP15daObjKWheel01_c, + (process_method_func)daObjKWheel01_MoveBGDelete__FP15daObjKWheel01_c, + (process_method_func)daObjKWheel01_MoveBGExecute__FP15daObjKWheel01_c, + 0, + (process_method_func)daObjKWheel01_MoveBGDraw__FP15daObjKWheel01_c, }; /* 80C4F74C-80C4F77C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_KWheel01 */ -SECTION_DATA extern void* g_profile_Obj_KWheel01[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00C80000, (void*)&g_fpcLf_Method, - (void*)0x00000704, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02970000, (void*)&daObjKWheel01_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_KWheel01 = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_KWheel01, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjKWheel01_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 663, // mPriority + &daObjKWheel01_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C4F77C-80C4F794 000084 0018+00 3/3 0/0 0/0 .data __vt__17dEvLib_callback_c */ @@ -455,7 +336,8 @@ static asm void daObjKWheel01_MoveBGDraw(daObjKWheel01_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dEvLib_callback_c::~dEvLib_callback_c() { +// asm dEvLib_callback_c::~dEvLib_callback_c() { +extern "C" asm void __dt__17dEvLib_callback_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kwheel01/d_a_obj_kwheel01/__dt__17dEvLib_callback_cFv.s" } @@ -463,17 +345,20 @@ asm dEvLib_callback_c::~dEvLib_callback_c() { /* 80C4F5F4-80C4F5FC 000BF4 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventStart() { +// bool dEvLib_callback_c::eventStart()() { +extern "C" bool eventStart__17dEvLib_callback_cFv() { return true; } /* 80C4F5FC-80C4F604 000BFC 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventRun() { +// bool dEvLib_callback_c::eventRun() { +extern "C" bool eventRun__17dEvLib_callback_cFv() { return true; } /* 80C4F604-80C4F60C 000C04 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventEnd() { +// bool dEvLib_callback_c::eventEnd() { +extern "C" bool eventEnd__17dEvLib_callback_cFv() { return true; } diff --git a/rel/d/a/obj/d_a_obj_kznkarm/d_a_obj_kznkarm.cpp b/rel/d/a/obj/d_a_obj_kznkarm/d_a_obj_kznkarm.cpp index f63f9cff63c..43240eebc90 100644 --- a/rel/d/a/obj/d_a_obj_kznkarm/d_a_obj_kznkarm.cpp +++ b/rel/d/a/obj/d_a_obj_kznkarm/d_a_obj_kznkarm.cpp @@ -1,148 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_kznkarm -// +/** + * @file d_a_obj_kznkarm.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_kznkarm/d_a_obj_kznkarm.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjKznkarm_c { - struct Mode_e {}; - - /* 80C4F858 */ void setAction(daObjKznkarm_c::Mode_e); - /* 80C4F88C */ void callInit(); - /* 80C4F8B4 */ void callExecute(); - /* 80C4F8E0 */ void initBroken(); - /* 80C4F960 */ void executeBroken(); - /* 80C4FBBC */ void initCarry(); - /* 80C4FBEC */ void executeCarry(); - /* 80C4FD18 */ void initThrow(); - /* 80C4FDB4 */ void executeThrow(); - /* 80C50488 */ void initStay(); - /* 80C50504 */ void executeStay(); - /* 80C505F8 */ void create_init(); - /* 80C506DC */ void initBaseMtx(); - /* 80C50708 */ void setBaseMtx(); - /* 80C5076C */ void getGroundSlope(s16); - - static u8 const M_attr[56]; - static u8 ActionTable[96]; -}; - -struct daObjKazeNeko_c { - /* 80C3CC40 */ void getFirstVec(cXyz*, int); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80C50B3C */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80C50BAC */ ~dBgS_AcchCir(); -}; - -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGPla { - /* 80C50440 */ ~cM3dGPla(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct cBgS { - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct _GXTexObj {}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -221,25 +84,15 @@ extern "C" void __dt__8cM3dGCirFv(); extern "C" void cLib_chaseAngleS__FPsss(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSVECAdd(); -extern "C" void PSVECScale(); -extern "C" void PSVECSquareMag(); -extern "C" void C_VECReflect(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_24(); extern "C" void _savegpr_29(); extern "C" void _restgpr_24(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void getFirstVec__15daObjKazeNeko_cFP4cXyzi(); @@ -532,25 +385,30 @@ SECTION_DATA static u8 w_eff_id[8] = { }; /* 80C50E90-80C50EB0 -00001 0020+00 1/0 0/0 0/0 .data l_daObjKznkarm_Method */ -SECTION_DATA static void* l_daObjKznkarm_Method[8] = { - (void*)daObjKznkarm_Create__FP10fopAc_ac_c, - (void*)daObjKznkarm_Delete__FP14daObjKznkarm_c, - (void*)daObjKznkarm_Execute__FP14daObjKznkarm_c, - (void*)daObjKznkarm_IsDelete__FP14daObjKznkarm_c, - (void*)daObjKznkarm_Draw__FP14daObjKznkarm_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjKznkarm_Method = { + (process_method_func)daObjKznkarm_Create__FP10fopAc_ac_c, + (process_method_func)daObjKznkarm_Delete__FP14daObjKznkarm_c, + (process_method_func)daObjKznkarm_Execute__FP14daObjKznkarm_c, + (process_method_func)daObjKznkarm_IsDelete__FP14daObjKznkarm_c, + (process_method_func)daObjKznkarm_Draw__FP14daObjKznkarm_c, }; /* 80C50EB0-80C50EE0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_KznkArm */ -SECTION_DATA extern void* g_profile_Obj_KznkArm[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x014F0000, (void*)&g_fpcLf_Method, - (void*)0x000007B4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x001F0000, (void*)&l_daObjKznkarm_Method, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_KznkArm = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_KznkArm, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjKznkarm_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 31, // mPriority + &l_daObjKznkarm_Method, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C50EE0-80C50EEC 00013C 000C+00 2/2 0/0 0/0 .data __vt__12dBgS_AcchCir */ @@ -594,7 +452,8 @@ asm void daObjKznkarm_c::executeThrow() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGPla::~cM3dGPla() { +// asm cM3dGPla::~cM3dGPla() { +extern "C" asm void __dt__8cM3dGPlaFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kznkarm/d_a_obj_kznkarm/__dt__8cM3dGPlaFv.s" } @@ -784,7 +643,8 @@ static asm void daObjKznkarm_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kznkarm/d_a_obj_kznkarm/__dt__12dBgS_ObjAcchFv.s" } @@ -794,7 +654,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kznkarm/d_a_obj_kznkarm/__dt__12dBgS_AcchCirFv.s" } diff --git a/rel/d/a/obj/d_a_obj_ladder/d_a_obj_ladder.cpp b/rel/d/a/obj/d_a_obj_ladder/d_a_obj_ladder.cpp index 11153510768..8367c318bfe 100644 --- a/rel/d/a/obj/d_a_obj_ladder/d_a_obj_ladder.cpp +++ b/rel/d/a/obj/d_a_obj_ladder/d_a_obj_ladder.cpp @@ -1,162 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_ladder -// +/** + * @file d_a_obj_ladder.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_ladder/d_a_obj_ladder.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct cXyz { - static f32 Zero[3]; -}; - -struct mDoMtx_stack_c { - /* 8000CCC8 */ void push(); - /* 8000CD14 */ void pop(); - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjLadder { - struct Act_c { - struct Prm_e {}; - - /* 8058D158 */ void CreateHeap(); - /* 8058D1D8 */ void Create(); - /* 8058D378 */ void Mthd_Create(); - /* 8058D4F0 */ bool Delete(); - /* 8058D4F8 */ void Mthd_Delete(); - /* 8058D544 */ void demo_end_reset(); - /* 8058D5AC */ void mode_wait_init(); - /* 8058D5B8 */ void mode_wait(); - /* 8058D614 */ void mode_demoreq_init(); - /* 8058D628 */ void mode_demoreq(); - /* 8058D6E8 */ void mode_vib_init(); - /* 8058D710 */ void mode_vib(); - /* 8058D7A8 */ void mode_drop_init(); - /* 8058D7EC */ void mode_drop(); - /* 8058D9C0 */ void mode_fell_init(); - /* 8058D9CC */ void mode_fell(); - /* 8058D9D0 */ void set_mtx(); - /* 8058DA64 */ void init_mtx(); - /* 8058DAA0 */ void Execute(f32 (**)[3][4]); - /* 8058DBB8 */ void Draw(); - - static u8 const M_arcname[5 + 3 /* padding */]; - static u8 M_tmp_mtx[48]; - }; -}; - -struct daObj { - /* 800373C0 */ void posMoveF_stream(fopAc_ac_c*, cXyz const*, cXyz const*, f32, f32); - template - void PrmAbstract(/* ... */); - /* 8058DD14 */ /* daObj::PrmAbstract */ - void func_8058DD14(void* _this, fopAc_ac_c const*, daObjLadder::Act_c::Prm_e, - daObjLadder::Act_c::Prm_e); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dEvent_manager_c { - /* 800474BC */ void getEventData(s16); - /* 80047698 */ void getEventIdx(fopAc_ac_c*, u8); - /* 80047A78 */ void endCheck(s16); -}; - -struct dBgW {}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjGndChk { - /* 8058D478 */ ~dBgS_ObjGndChk(); -}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; - -struct cBgS { - /* 800744A0 */ void GroundCross(cBgS_GndChk*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; - // // Forward References: // @@ -239,18 +88,12 @@ extern "C" void dKy_pol_sound_get__FPC13cBgS_PolyInfo(); extern "C" void SetPos__11cBgS_GndChkFPC4cXyz(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" f32 Zero__4cXyz[3]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -452,16 +295,30 @@ SECTION_DATA static u8 mode_proc[60] = { /* 8058DE74-8058DE94 -00001 0020+00 1/0 0/0 0/0 .data * Mthd_Table__Q211daObjLadder28@unnamed@d_a_obj_ladder_cpp@ */ -SECTION_DATA static void* data_8058DE74[8] = { - (void*)func_8058DC5C, (void*)func_8058DC7C, (void*)func_8058DC9C, (void*)func_8058DCE8, - (void*)func_8058DCBC, (void*)NULL, (void*)NULL, (void*)NULL, +static actor_method_class data_8058DE74 = { + (process_method_func)func_8058DC5C, + (process_method_func)func_8058DC7C, + (process_method_func)func_8058DC9C, + (process_method_func)func_8058DCE8, + (process_method_func)func_8058DCBC, }; /* 8058DE94-8058DEC4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Ladder */ -SECTION_DATA extern void* g_profile_Obj_Ladder[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, (void*)0x00240000, (void*)&g_fpcLf_Method, - (void*)0x00000620, (void*)NULL, (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00170000, (void*)&data_8058DE74, (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Ladder = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Ladder, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjLadder), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 23, // mPriority + &data_8058DE74, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 8058DEC4-8058DEF4 000118 0030+00 2/2 0/0 0/0 .data __vt__14dBgS_ObjGndChk */ @@ -508,7 +365,8 @@ asm void daObjLadder::Act_c::Mthd_Create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +// asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +extern "C" asm void __dt__14dBgS_ObjGndChkFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ladder/d_a_obj_ladder/__dt__14dBgS_ObjGndChkFv.s" } diff --git a/rel/d/a/obj/d_a_obj_laundry/d_a_obj_laundry.cpp b/rel/d/a/obj/d_a_obj_laundry/d_a_obj_laundry.cpp index 531f1b66d44..6ba95aa12d2 100644 --- a/rel/d/a/obj/d_a_obj_laundry/d_a_obj_laundry.cpp +++ b/rel/d/a/obj/d_a_obj_laundry/d_a_obj_laundry.cpp @@ -1,91 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_laundry -// +/** + * @file d_a_obj_laundry.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_laundry/d_a_obj_laundry.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CCC8 */ void push(); - /* 8000CD14 */ void pop(); - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct csXyz {}; - -struct daObjLdy_c { - /* 80C50F98 */ void create_init(); - /* 80C51088 */ void initBaseMtx(); - /* 80C510F8 */ void setBaseMtx(); - /* 80C5116C */ void getJointAngle(csXyz*, int); - /* 80C51194 */ void setNormalClothPos(); - /* 80C51644 */ void calcJointAngle(); - /* 80C5183C */ bool divorceParent(); - - static u8 const M_attr[52]; -}; - -struct dKy_tevstr_c {}; -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); -}; - -struct LaundJoint_c { - /* 80C51D2C */ ~LaundJoint_c(); - /* 80C51EC0 */ LaundJoint_c(); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DSys { - static u8 mCurrentMtx[48]; -}; - -struct J3DModel {}; - -struct J3DJoint {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80C51A98 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -157,9 +79,6 @@ extern "C" void cM_rnd__Fv(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXInverse(); -extern "C" void PSMTXMultVec(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void _savegpr_25(); @@ -168,8 +87,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_25(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -177,8 +94,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; @@ -422,25 +337,30 @@ SECTION_DEAD static char const* const stringBase_80C520E0 = "J_Sentaku.btk"; SECTION_DATA static void* l_arcName = (void*)&d_a_obj_laundry__stringBase0; /* 80C520F4-80C52114 -00001 0020+00 1/0 0/0 0/0 .data l_daObjLdy_Method */ -SECTION_DATA static void* l_daObjLdy_Method[8] = { - (void*)daObjLdy_Create__FP10fopAc_ac_c, - (void*)daObjLdy_Delete__FP10daObjLdy_c, - (void*)daObjLdy_Execute__FP10daObjLdy_c, - (void*)daObjLdy_IsDelete__FP10daObjLdy_c, - (void*)daObjLdy_Draw__FP10daObjLdy_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjLdy_Method = { + (process_method_func)daObjLdy_Create__FP10fopAc_ac_c, + (process_method_func)daObjLdy_Delete__FP10daObjLdy_c, + (process_method_func)daObjLdy_Execute__FP10daObjLdy_c, + (process_method_func)daObjLdy_IsDelete__FP10daObjLdy_c, + (process_method_func)daObjLdy_Draw__FP10daObjLdy_c, }; /* 80C52114-80C52144 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Laundry */ -SECTION_DATA extern void* g_profile_Obj_Laundry[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01550000, (void*)&g_fpcLf_Method, - (void*)0x000007C8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00250000, (void*)&l_daObjLdy_Method, - (void*)0x00040180, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Laundry = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Laundry, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjLdy_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 37, // mPriority + &l_daObjLdy_Method, // sub_method + 0x00040180, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C52144-80C52150 000054 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -492,7 +412,8 @@ static asm void createSolidHeap(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_laundry/d_a_obj_laundry/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope.cpp b/rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope.cpp index d2b52869d62..36fb986917d 100644 --- a/rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope.cpp +++ b/rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope.cpp @@ -1,62 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_laundry_rope -// +/** + * @file d_a_obj_laundry_rope.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoExt_3DlineMat_c {}; - -struct mDoExt_3DlineMatSortPacket { - /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); -}; - -struct ResTIMG {}; - -struct _GXColor {}; - -struct dKy_tevstr_c {}; - -struct mDoExt_3DlineMat1_c { - /* 80013360 */ void init(u16, u16, ResTIMG*, int); - /* 80013FB0 */ void update(int, _GXColor&, dKy_tevstr_c*); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjLndRope_c { - /* 80C521F8 */ void create_init(); - /* 80C5285C */ void initBaseMtx(); - /* 80C52890 */ void setBaseMtx(); - /* 80C528E0 */ void setNormalRopePos(); - - static u8 const M_attr[20]; -}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); -}; - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; // // Forward References: @@ -116,7 +66,6 @@ extern "C" void cM_rnd__Fv(); extern "C" void cLib_targetAngleY__FPC3VecPC3Vec(); extern "C" void cLib_targetAngleX__FPC4cXyzPC4cXyz(); extern "C" void __dl__FPv(); -extern "C" void PSMTXTrans(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void _savegpr_25(); @@ -124,15 +73,12 @@ extern "C" void _savegpr_26(); extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; // // Declarations: @@ -410,25 +356,30 @@ static bool daObjLndRope_IsDelete(daObjLndRope_c* param_0) { /* ############################################################################################## */ /* 80C533D4-80C533F4 -00001 0020+00 1/0 0/0 0/0 .data l_daObjLndRope_Method */ -SECTION_DATA static void* l_daObjLndRope_Method[8] = { - (void*)daObjLndRope_Create__FP10fopAc_ac_c, - (void*)daObjLndRope_Delete__FP14daObjLndRope_c, - (void*)daObjLndRope_Execute__FP14daObjLndRope_c, - (void*)daObjLndRope_IsDelete__FP14daObjLndRope_c, - (void*)daObjLndRope_Draw__FP14daObjLndRope_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjLndRope_Method = { + (process_method_func)daObjLndRope_Create__FP10fopAc_ac_c, + (process_method_func)daObjLndRope_Delete__FP14daObjLndRope_c, + (process_method_func)daObjLndRope_Execute__FP14daObjLndRope_c, + (process_method_func)daObjLndRope_IsDelete__FP14daObjLndRope_c, + (process_method_func)daObjLndRope_Draw__FP14daObjLndRope_c, }; /* 80C533F4-80C53424 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_LndRope */ -SECTION_DATA extern void* g_profile_Obj_LndRope[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01520000, (void*)&g_fpcLf_Method, - (void*)0x00001774, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00220000, (void*)&l_daObjLndRope_Method, - (void*)0x00040180, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_LndRope = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_LndRope, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjLndRope_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 34, // mPriority + &l_daObjLndRope_Method, // sub_method + 0x00040180, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C53424-80C53438 000058 0014+00 1/1 0/0 0/0 .data __vt__18mDoExt_3DlineMat_c */ diff --git a/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.cpp b/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.cpp index 090d7d0c245..3c3013a8451 100644 --- a/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.cpp +++ b/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.cpp @@ -1,188 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_life_container -// +/** + * @file d_a_obj_life_container.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObjLife_c { - /* 804CCBE4 */ void initBaseMtx(); - /* 804CCC04 */ void setBaseMtx(); - /* 804CCC6C */ void Create(); - /* 804CCE00 */ void setEffect(); - /* 804CCF5C */ void endEffect00(); - /* 804CCFAC */ void endEffect02(); - /* 804CCFD8 */ bool __CreateHeap(); - /* 804CCFE0 */ void create(); - /* 804CD428 */ void bg_check(); - /* 804CD5B8 */ void actionWaitInit(); - /* 804CD660 */ void actionWait(); - /* 804CD8C0 */ void initActionOrderGetDemo(); - /* 804CD98C */ void actionOrderGetDemo(); - /* 804CDA08 */ void actionGetDemo(); - /* 804CDBC8 */ void actionSwOnWait(); - /* 804CDC2C */ void actionInitBoomerangCarry(); - /* 804CDD0C */ void actionBoomerangCarry(); - /* 804CDD7C */ void actionInitWait2(); - /* 804CDD8C */ void actionWait2(); - /* 804CDDAC */ void calcScale(); - /* 804CDE70 */ void execute(); - /* 804CE19C */ void draw(); - /* 804CE1F0 */ void setListStart(); - /* 804CE214 */ void _delete(); -}; - -struct daItemBase_c { - /* 80037A64 */ void hide(); - /* 80037A74 */ void show(); - /* 80037ACC */ void chkDraw(); - /* 80144724 */ void DeleteBase(char const*); - /* 8014474C */ bool clothCreate(); - /* 80144B94 */ void DrawBase(); - /* 80144C30 */ void RotateYBase(); - /* 80144CC4 */ void settingBeforeDraw(); - /* 80144D18 */ void setTevStr(); - /* 80144D70 */ void setShadow(); - /* 80144EDC */ void animEntry(); - /* 8014503C */ void animPlay(f32, f32, f32, f32, f32, f32); - /* 80145144 */ void chkFlag(int); - /* 80145164 */ void getTevFrm(); - /* 80145180 */ void getBtpFrm(); - /* 8014519C */ void getShadowSize(); - /* 801451B4 */ void getCollisionH(); - /* 801451D0 */ void getCollisionR(); - /* 8015B0B8 */ void getData(); -}; - -struct dSv_memBit_c { - /* 80034934 */ void isDungeonItem(int) const; -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; - /* 800354E0 */ void onItem(int, int); - /* 80035590 */ void isItem(int, int) const; -}; - -struct dSv_event_c { - /* 800349E0 */ void setEventReg(u16, u8); - /* 80034A04 */ void getEventReg(u16) const; -}; - -struct dPa_levelEcallBack { - /* 804CD258 */ void cleanup(); - /* 804CE33C */ ~dPa_levelEcallBack(); -}; - -struct dPa_followEcallBack { - /* 80049580 */ dPa_followEcallBack(u8, u8); -}; - -struct dKy_tevstr_c {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dItem_data { - static void* field_item_res[1020]; - static u8 item_info[1020 + 4 /* padding */]; -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dEvent_manager_c { - /* 80047ADC */ void endCheckOld(char const*); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 804CD3B8 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 804CD348 */ ~dBgS_AcchCir(); -}; - -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct cBgS { - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDFF8 */ void deleteObject(); - /* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*); -}; - -struct JPABaseEmitter {}; - -struct JPAEmitterCallBack { - /* 8027E6A4 */ ~JPAEmitterCallBack(); - /* 804CE3B0 */ void execute(JPABaseEmitter*); - /* 804CE3B4 */ void executeAfter(JPABaseEmitter*); - /* 804CE3B8 */ void draw(JPABaseEmitter*); - /* 804CE3BC */ void drawAfter(JPABaseEmitter*); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; // // Forward References: @@ -321,17 +145,12 @@ extern "C" void deleteObject__14Z2SoundObjBaseFv(); extern "C" void startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase(); extern "C" void __ct__16Z2SoundObjSimpleFv(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXInverse(); -extern "C" void PSMTXMultVec(); extern "C" void __ptmf_scall(); extern "C" void __cvt_fp2unsigned(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" void* field_item_res__10dItem_data[1020]; @@ -342,7 +161,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_804CE6A0[4]; @@ -494,25 +312,30 @@ SECTION_DATA static u8 l_demoFunc[72] = { #pragma pop /* 804CE57C-804CE59C -00001 0020+00 1/0 0/0 0/0 .data l_daObjLife_Method */ -SECTION_DATA static void* l_daObjLife_Method[8] = { - (void*)daObjLife_Create__FP10fopAc_ac_c, - (void*)daObjLife_Delete__FP11daObjLife_c, - (void*)daObjLife_Execute__FP11daObjLife_c, - (void*)NULL, - (void*)daObjLife_Draw__FP11daObjLife_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjLife_Method = { + (process_method_func)daObjLife_Create__FP10fopAc_ac_c, + (process_method_func)daObjLife_Delete__FP11daObjLife_c, + (process_method_func)daObjLife_Execute__FP11daObjLife_c, + 0, + (process_method_func)daObjLife_Draw__FP11daObjLife_c, }; /* 804CE59C-804CE5CC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_LifeContainer */ -SECTION_DATA extern void* g_profile_Obj_LifeContainer[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x021B0000, (void*)&g_fpcLf_Method, - (void*)0x000009D4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00EF0000, (void*)&l_daObjLife_Method, - (void*)0x000C4100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_LifeContainer = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_LifeContainer, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjLife_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 239, // mPriority + &l_daObjLife_Method, // sub_method + 0x000C4100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 804CE5CC-804CE5D8 000100 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ @@ -767,7 +590,8 @@ asm void daObjLife_c::create() { #pragma pop /* 804CD258-804CD25C 000AF8 0004+00 1/0 0/0 0/0 .text cleanup__18dPa_levelEcallBackFv */ -void dPa_levelEcallBack::cleanup() { +// void dPa_levelEcallBack::cleanup() { +extern "C" asm void cleanup__18dPa_levelEcallBackFv() { /* empty function */ } @@ -808,7 +632,8 @@ extern "C" asm void __dt__10dCcD_GSttsFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container/__dt__12dBgS_AcchCirFv.s" } @@ -818,7 +643,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container/__dt__12dBgS_ObjAcchFv.s" } @@ -1143,7 +969,8 @@ extern "C" asm void __dt__10cCcD_GSttsFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dPa_levelEcallBack::~dPa_levelEcallBack() { +// asm dPa_levelEcallBack::~dPa_levelEcallBack() { +extern "C" asm void __dt__18dPa_levelEcallBackFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container/__dt__18dPa_levelEcallBackFv.s" } @@ -1151,25 +978,29 @@ asm dPa_levelEcallBack::~dPa_levelEcallBack() { /* 804CE3B0-804CE3B4 001C50 0004+00 1/0 0/0 0/0 .text * execute__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::execute(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::execute(JPABaseEmitter* param_0) { +extern "C" asm void execute__18JPAEmitterCallBackFP14JPABaseEmitter() { /* empty function */ } /* 804CE3B4-804CE3B8 001C54 0004+00 1/0 0/0 0/0 .text * executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::executeAfter(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::executeAfter(JPABaseEmitter* param_0) { +extern "C" asm void executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter() { /* empty function */ } /* 804CE3B8-804CE3BC 001C58 0004+00 1/0 0/0 0/0 .text draw__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::draw(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::draw(JPABaseEmitter* param_0) { +extern "C" asm void draw__18JPAEmitterCallBackFP14JPABaseEmitter() { /* empty function */ } /* 804CE3BC-804CE3C0 001C5C 0004+00 1/0 0/0 0/0 .text * drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::drawAfter(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::drawAfter(JPABaseEmitter* param_0) { +extern "C" asm void drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter() { /* empty function */ } diff --git a/rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.cpp b/rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.cpp index 9805b3f5e4f..aaedcd96108 100644 --- a/rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.cpp +++ b/rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.cpp @@ -1,93 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lp -// +/** + * @file d_a_obj_lp.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.h" #include "dol2asm.h" -// -// Types: -// - -struct wd_ss { - /* 80C559C8 */ ~wd_ss(); - /* 80C55A04 */ wd_ss(); -}; - -struct request_of_phase_process_class {}; - -struct obj_lp_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoExt_3DlineMat_c {}; - -struct mDoExt_3DlineMatSortPacket { - /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); -}; - -struct dKy_tevstr_c {}; - -struct _GXColor {}; - -struct mDoExt_3DlineMat0_c { - /* 800125E0 */ void init(u16, u16, int); - /* 80012E3C */ void update(int, _GXColor&, dKy_tevstr_c*); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct J3DModel {}; - -struct J3DModelData {}; - -struct dComIfG_play_c { - /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); - /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); - /* 8002CB68 */ void entrySimpleModel(J3DModel*, int); -}; - -struct dBgS_ObjGndChk_Spl { - /* 800777B0 */ dBgS_ObjGndChk_Spl(); - /* 80077848 */ ~dBgS_ObjGndChk_Spl(); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - -struct cBgS_GndChk { - /* 80267D0C */ void SetPos(Vec const*); -}; - -struct cBgS { - /* 800744A0 */ void GroundCross(cBgS_GndChk*); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; // // Forward References: @@ -154,9 +73,6 @@ extern "C" void MtxPosition__FP4cXyzP4cXyz(); extern "C" void MtxPush__Fv(); extern "C" void MtxPull__Fv(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSVECSquareMag(); extern "C" void __construct_array(); extern "C" void _savegpr_22(); extern "C" void _savegpr_24(); @@ -168,16 +84,11 @@ extern "C" void _restgpr_24(); extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" void _restgpr_29(); -extern "C" void strcmp(); extern "C" extern void* __vt__19mDoExt_3DlineMat0_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; // // Declarations: @@ -709,25 +620,30 @@ SECTION_DEAD static char const* const stringBase_80C55ACE = "F_SP127"; #pragma pop /* 80C55ADC-80C55AFC -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Lp_Method */ -SECTION_DATA static void* l_daObj_Lp_Method[8] = { - (void*)daObj_Lp_Create__FP10fopAc_ac_c, - (void*)daObj_Lp_Delete__FP12obj_lp_class, - (void*)daObj_Lp_Execute__FP12obj_lp_class, - (void*)daObj_Lp_IsDelete__FP12obj_lp_class, - (void*)daObj_Lp_Draw__FP12obj_lp_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObj_Lp_Method = { + (process_method_func)daObj_Lp_Create__FP10fopAc_ac_c, + (process_method_func)daObj_Lp_Delete__FP12obj_lp_class, + (process_method_func)daObj_Lp_Execute__FP12obj_lp_class, + (process_method_func)daObj_Lp_IsDelete__FP12obj_lp_class, + (process_method_func)daObj_Lp_Draw__FP12obj_lp_class, }; /* 80C55AFC-80C55B2C -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_LP */ -SECTION_DATA extern void* g_profile_OBJ_LP[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01160000, (void*)&g_fpcLf_Method, - (void*)0x0000ADB8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02C40000, (void*)&l_daObj_Lp_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_LP = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_LP, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(obj_lp_class), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 708, // mPriority + &l_daObj_Lp_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C55B2C-80C55B40 000054 0014+00 1/1 0/0 0/0 .data __vt__18mDoExt_3DlineMat_c */ diff --git a/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle.cpp b/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle.cpp index d30b98a6d5c..230c2251c4f 100644 --- a/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle.cpp +++ b/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv2Candle -// +/** + * @file d_a_obj_lv2Candle.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle.h" #include "d/com/d_com_inf_game.h" diff --git a/rel/d/a/obj/d_a_obj_lv3Water/d_a_obj_lv3Water.cpp b/rel/d/a/obj/d_a_obj_lv3Water/d_a_obj_lv3Water.cpp index 2099500725b..4a7f976219d 100644 --- a/rel/d/a/obj/d_a_obj_lv3Water/d_a_obj_lv3Water.cpp +++ b/rel/d/a/obj/d_a_obj_lv3Water/d_a_obj_lv3Water.cpp @@ -1,156 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv3Water -// +/** + * @file d_a_obj_lv3Water.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv3Water/d_a_obj_lv3Water.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C587F0 */ ~mDoHIO_entry_c(); -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daLv3Water_c { - /* 80C58838 */ void setBaseMtx(); - /* 80C5891C */ void CreateHeap(); - /* 80C58ABC */ void create(); - /* 80C58D68 */ void Execute(f32 (**)[3][4]); - /* 80C58E20 */ void effectSet(); - /* 80C596F4 */ void mode_proc_wait(); - /* 80C59754 */ void mode_init_levelCtrl(); - /* 80C597FC */ void mode_proc_levelCtrl(); - /* 80C598BC */ void Draw(); - /* 80C59AA0 */ void Delete(); - /* 80C59AE0 */ void eventStart(); - /* 80C59D80 */ ~daLv3Water_c(); -}; - -struct daLv3Water_HIO_c { - /* 80C587CC */ daLv3Water_HIO_c(); - /* 80C59C34 */ ~daLv3Water_HIO_c(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData { - /* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]); -}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dEvLib_callback_c { - /* 8004886C */ void eventUpdate(); - /* 80048940 */ void orderEvent(int, int, int); - /* 80C59D20 */ ~dEvLib_callback_c(); - /* 80C59D68 */ bool eventStart(); - /* 80C59D70 */ bool eventRun(); - /* 80C59D78 */ bool eventEnd(); -}; -struct dBgW_Base {}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DTexMtxInfo { - /* 80325794 */ void setEffectMtx(f32 (*)[4]); -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80C58D20 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -224,9 +80,6 @@ extern "C" void __dl__FPv(); extern "C" void setEffectMtx__13J3DTexMtxInfoFPA4_f(); extern "C" void simpleCalcMaterial__12J3DModelDataFUsPA4_f(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void C_MTXLightPerspective(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_25(); extern "C" void _savegpr_28(); @@ -234,14 +87,9 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_25(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern u8 const j3dDefaultMtx[48]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -368,25 +216,30 @@ SECTION_DATA static void* lit_4043[18] = { }; /* 80C5A228-80C5A248 -00001 0020+00 1/0 0/0 0/0 .data l_daLv3Water_Method */ -SECTION_DATA static void* l_daLv3Water_Method[8] = { - (void*)daLv3Water_Create__FP10fopAc_ac_c, - (void*)daLv3Water_Delete__FP12daLv3Water_c, - (void*)daLv3Water_Execute__FP12daLv3Water_c, - (void*)NULL, - (void*)daLv3Water_Draw__FP12daLv3Water_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daLv3Water_Method = { + (process_method_func)daLv3Water_Create__FP10fopAc_ac_c, + (process_method_func)daLv3Water_Delete__FP12daLv3Water_c, + (process_method_func)daLv3Water_Execute__FP12daLv3Water_c, + 0, + (process_method_func)daLv3Water_Draw__FP12daLv3Water_c, }; /* 80C5A248-80C5A278 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv3Water */ -SECTION_DATA extern void* g_profile_Obj_Lv3Water[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00D50000, (void*)&g_fpcLf_Method, - (void*)0x00000628, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02680000, (void*)&l_daLv3Water_Method, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv3Water = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv3Water, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daLv3Water_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 616, // mPriority + &l_daLv3Water_Method, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C5A278-80C5A284 00013C 000C+00 3/3 0/0 0/0 .data __vt__12J3DFrameCtrl */ @@ -456,7 +309,8 @@ asm daLv3Water_HIO_c::daLv3Water_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv3Water/d_a_obj_lv3Water/__dt__14mDoHIO_entry_cFv.s" } @@ -626,7 +480,8 @@ asm void daLv3Water_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv3Water/d_a_obj_lv3Water/__dt__12J3DFrameCtrlFv.s" } @@ -848,7 +703,8 @@ static asm void func_80C59D18() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dEvLib_callback_c::~dEvLib_callback_c() { +// asm dEvLib_callback_c::~dEvLib_callback_c() { +extern "C" asm void __dt__17dEvLib_callback_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv3Water/d_a_obj_lv3Water/__dt__17dEvLib_callback_cFv.s" } @@ -856,17 +712,20 @@ asm dEvLib_callback_c::~dEvLib_callback_c() { /* 80C59D68-80C59D70 001688 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventStart() { +// bool dEvLib_callback_c::eventStart() { +extern "C" bool eventStart__17dEvLib_callback_cFv() { return true; } /* 80C59D70-80C59D78 001690 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventRun() { +// bool dEvLib_callback_c::eventRun() { +extern "C" bool eventRun__17dEvLib_callback_cFv() { return true; } /* 80C59D78-80C59D80 001698 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventEnd() { +// bool dEvLib_callback_c::eventEnd() { +extern "C" bool eventEnd__17dEvLib_callback_cFv() { return true; } diff --git a/rel/d/a/obj/d_a_obj_lv3Water2/d_a_obj_lv3Water2.cpp b/rel/d/a/obj/d_a_obj_lv3Water2/d_a_obj_lv3Water2.cpp index e27a033957d..7744de27269 100644 --- a/rel/d/a/obj/d_a_obj_lv3Water2/d_a_obj_lv3Water2.cpp +++ b/rel/d/a/obj/d_a_obj_lv3Water2/d_a_obj_lv3Water2.cpp @@ -1,145 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv3Water2 -// +/** + * @file d_a_obj_lv3Water2.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv3Water2/d_a_obj_lv3Water2.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C5A430 */ ~mDoHIO_entry_c(); -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daLv3Water2_c { - /* 80C5A478 */ void setBaseMtx(); - /* 80C5A4F8 */ void CreateHeap(); - /* 80C5A5E4 */ void create(); - /* 80C5A844 */ void Execute(f32 (**)[3][4]); - /* 80C5AC10 */ void mode_proc_wait(); - /* 80C5ACB8 */ void mode_init_levelCtrl(); - /* 80C5ACE4 */ void mode_proc_levelCtrl(); - /* 80C5ADA4 */ void Draw(); - /* 80C5AEFC */ void Delete(); - /* 80C5AF3C */ void eventStart(); - /* 80C5B298 */ ~daLv3Water2_c(); -}; - -struct daLv3Water2_HIO_c { - /* 80C5A40C */ daLv3Water2_HIO_c(); - /* 80C5B14C */ ~daLv3Water2_HIO_c(); -}; -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData { - /* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]); -}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dEvLib_callback_c { - /* 8004886C */ void eventUpdate(); - /* 80048940 */ void orderEvent(int, int, int); - /* 80C5B238 */ ~dEvLib_callback_c(); - /* 80C5B280 */ bool eventStart(); - /* 80C5B288 */ bool eventRun(); - /* 80C5B290 */ bool eventEnd(); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DTexMtxInfo { - /* 80325794 */ void setEffectMtx(f32 (*)[4]); -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80C5A7FC */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -210,9 +77,6 @@ extern "C" void __dl__FPv(); extern "C" void setEffectMtx__13J3DTexMtxInfoFPA4_f(); extern "C" void simpleCalcMaterial__12J3DModelDataFUsPA4_f(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void C_MTXLightPerspective(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_27(); extern "C" void _savegpr_28(); @@ -220,14 +84,9 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern u8 const j3dDefaultMtx[48]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -290,25 +149,30 @@ SECTION_DATA static u8 l_mode_func[24] = { }; /* 80C5B3F8-80C5B418 -00001 0020+00 1/0 0/0 0/0 .data l_daLv3Water2_Method */ -SECTION_DATA static void* l_daLv3Water2_Method[8] = { - (void*)daLv3Water2_Create__FP10fopAc_ac_c, - (void*)daLv3Water2_Delete__FP13daLv3Water2_c, - (void*)daLv3Water2_Execute__FP13daLv3Water2_c, - (void*)NULL, - (void*)daLv3Water2_Draw__FP13daLv3Water2_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daLv3Water2_Method = { + (process_method_func)daLv3Water2_Create__FP10fopAc_ac_c, + (process_method_func)daLv3Water2_Delete__FP13daLv3Water2_c, + (process_method_func)daLv3Water2_Execute__FP13daLv3Water2_c, + 0, + (process_method_func)daLv3Water2_Draw__FP13daLv3Water2_c, }; /* 80C5B418-80C5B448 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv3Water2 */ -SECTION_DATA extern void* g_profile_Obj_Lv3Water2[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00D60000, (void*)&g_fpcLf_Method, - (void*)0x00000610, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02690000, (void*)&l_daLv3Water2_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv3Water2 = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv3Water2, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daLv3Water2_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 617, // mPriority + &l_daLv3Water2_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C5B448-80C5B454 0000A4 000C+00 3/3 0/0 0/0 .data __vt__12J3DFrameCtrl */ @@ -378,7 +242,8 @@ asm daLv3Water2_HIO_c::daLv3Water2_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv3Water2/d_a_obj_lv3Water2/__dt__14mDoHIO_entry_cFv.s" } @@ -453,7 +318,8 @@ asm void daLv3Water2_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv3Water2/d_a_obj_lv3Water2/__dt__12J3DFrameCtrlFv.s" } @@ -665,7 +531,8 @@ static asm void func_80C5B230() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dEvLib_callback_c::~dEvLib_callback_c() { +// asm dEvLib_callback_c::~dEvLib_callback_c() { +extern "C" asm void __dt__17dEvLib_callback_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv3Water2/d_a_obj_lv3Water2/__dt__17dEvLib_callback_cFv.s" } @@ -673,17 +540,20 @@ asm dEvLib_callback_c::~dEvLib_callback_c() { /* 80C5B280-80C5B288 000F60 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventStart() { +// bool dEvLib_callback_c::eventStart() { +extern "C" bool eventStart__17dEvLib_callback_cFv() { return true; } /* 80C5B288-80C5B290 000F68 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventRun() { +// bool dEvLib_callback_c::eventRun() { +extern "C" bool eventRun__17dEvLib_callback_cFv() { return true; } /* 80C5B290-80C5B298 000F70 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventEnd() { +// bool dEvLib_callback_c::eventEnd() { +extern "C" bool eventEnd__17dEvLib_callback_cFv() { return true; } diff --git a/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.cpp b/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.cpp index f3d45bd2b92..e884a9b3155 100644 --- a/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.cpp +++ b/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv4CandleDemoTag -// +/** + * @file d_a_obj_lv4CandleDemoTag.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.h" #include "d/com/d_com_inf_game.h" @@ -10,69 +10,6 @@ #include "dol2asm.h" #include "m_Do/m_Do_hostIO.h" -// -// Types: -// - -class daLv4EdShutter_c : public fopAc_ac_c { -public: - u8 getStatus() { return mStatus; } - - /* 0x568 */ u8 field_0x568[0x5CA - 0x568]; - /* 0x56A */ u8 mStatus; -}; - -// idk how this works atm. dEvLib_callback_c seems to need to be inherited, but this data comes -// before it. the fopAc_ac_c struct size is 100% correct, so do not change it -struct temp { - /* 0x568 */ u8 field_0x568[0x570 - 0x568]; -}; - -class dalv4CandleDemoTag_c : public fopAc_ac_c, temp, public dEvLib_callback_c { -public: - dalv4CandleDemoTag_c() : dEvLib_callback_c(this) {} - - /* 80C5CA58 */ void setBaseMtx(); - /* 80C5CA90 */ int create(); - /* 80C5CBA4 */ int Execute(); - /* 80C5CBE8 */ void procMain(); - /* 80C5CCA4 */ void init_modeWatch(); - /* 80C5CCC0 */ void modeWatch(); - /* 80C5CDC0 */ void init_modeEnemyCreate(); - /* 80C5CE70 */ void modeEnemyCreate(); - /* 80C5CEB4 */ void init_modeNG(); - /* 80C5CEC0 */ void modeNG(); - /* 80C5CF34 */ void init_modeEnd(); - /* 80C5CF40 */ void modeEnd(); - /* 80C5CF9C */ static void* searchShutterAct(void*, void*); - /* 80C5CFEC */ int Draw(); - /* 80C5CFF4 */ int Delete(); - - u8 getPathID() { return fopAcM_GetParamBit(this, 0x10, 8); } - int getSwNG() { return fopAcM_GetParamBit(this, 0, 8); } - int getSwDest() { return fopAcM_GetParamBit(this, 8, 8); } - int getSwOK() { return shape_angle.x & 0xFF; } - int getEventID() { return fopAcM_GetParamBit(this, 0x18, 8); } - - /* 80C5D184 */ virtual ~dalv4CandleDemoTag_c(); - /* 80C5CF78 */ virtual BOOL eventStart(); - - /* 0x584 */ u8 mMode; - /* 0x585 */ u8 mPathID; - /* 0x586 */ u8 mSwNG; - /* 0x587 */ u8 mSwDest; - /* 0x588 */ u16 mEnemyWaitTime; - /* 0x58C */ daLv4EdShutter_c* mpShutterActor; -}; - -class dalv4CandleDemoTag_HIO_c : public mDoHIO_entry_c { -public: - /* 80C5C9EC */ dalv4CandleDemoTag_HIO_c(); - /* 80C5D07C */ virtual ~dalv4CandleDemoTag_HIO_c(); - - /* 0x4 */ s16 mEnemyWaitTime; -}; - // // Forward References: // @@ -206,25 +143,30 @@ SECTION_DATA static u8 mode_proc[48] = { #pragma pop /* 80C5D298-80C5D2B8 -00001 0020+00 1/0 0/0 0/0 .data l_dalv4CandleDemoTag_Method */ -SECTION_DATA static void* l_dalv4CandleDemoTag_Method[8] = { - (void*)dalv4CandleDemoTag_Create__FP10fopAc_ac_c, - (void*)dalv4CandleDemoTag_Delete__FP20dalv4CandleDemoTag_c, - (void*)dalv4CandleDemoTag_Execute__FP20dalv4CandleDemoTag_c, - (void*)NULL, - (void*)dalv4CandleDemoTag_Draw__FP20dalv4CandleDemoTag_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_dalv4CandleDemoTag_Method = { + (process_method_func)dalv4CandleDemoTag_Create__FP10fopAc_ac_c, + (process_method_func)dalv4CandleDemoTag_Delete__FP20dalv4CandleDemoTag_c, + (process_method_func)dalv4CandleDemoTag_Execute__FP20dalv4CandleDemoTag_c, + 0, + (process_method_func)dalv4CandleDemoTag_Draw__FP20dalv4CandleDemoTag_c, }; /* 80C5D2B8-80C5D2E8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Lv4CandleDm */ -SECTION_DATA extern void* g_profile_Tag_Lv4CandleDm[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01740000, (void*)&g_fpcLf_Method, - (void*)0x00000590, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x021D0000, (void*)&l_dalv4CandleDemoTag_Method, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Tag_Lv4CandleDm = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Tag_Lv4CandleDm, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(dalv4CandleDemoTag_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 541, // mPriority + &l_dalv4CandleDemoTag_Method, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C5D2E8-80C5D310 0000D0 0028+00 2/2 0/0 0/0 .data __vt__20dalv4CandleDemoTag_c */ @@ -537,7 +479,7 @@ extern "C" bool eventEnd__17dEvLib_callback_cFv() { /* 80C5D17C-80C5D184 00087C 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv */ -// bool dEvLib_callback_c::eventStart() { +// bool dEvLib_callback_c::eventStart()() { extern "C" bool eventStart__17dEvLib_callback_cFv() { return true; } diff --git a/rel/d/a/obj/d_a_obj_lv4EdShutter/d_a_obj_lv4EdShutter.cpp b/rel/d/a/obj/d_a_obj_lv4EdShutter/d_a_obj_lv4EdShutter.cpp index a98b2de0a60..b98b70465d6 100644 --- a/rel/d/a/obj/d_a_obj_lv4EdShutter/d_a_obj_lv4EdShutter.cpp +++ b/rel/d/a/obj/d_a_obj_lv4EdShutter/d_a_obj_lv4EdShutter.cpp @@ -1,117 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv4EdShutter -// +/** + * @file d_a_obj_lv4EdShutter.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv4EdShutter/d_a_obj_lv4EdShutter.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C5DDF0 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daLv4EdShutter_c { - /* 80C5DE38 */ void setBaseMtx(); - /* 80C5DEC8 */ void CreateHeap(); - /* 80C5DF34 */ void create(); - /* 80C5E0A4 */ void Execute(f32 (**)[3][4]); - /* 80C5E0F4 */ void move(); - /* 80C5E1B0 */ void init_modeWait(); - /* 80C5E1C8 */ void modeWait(); - /* 80C5E2E0 */ void init_modeOpen(); - /* 80C5E394 */ void modeOpen(); - /* 80C5E464 */ void init_modeClose(); - /* 80C5E518 */ void modeClose(); - /* 80C5E584 */ void init_modeEnd(); - /* 80C5E590 */ void modeEnd(); - /* 80C5E594 */ void eventStart(); - /* 80C5E5CC */ void Draw(); - /* 80C5E670 */ void Delete(); - /* 80C5E834 */ ~daLv4EdShutter_c(); -}; - -struct daLv4EdShutter_HIO_c { - /* 80C5DDAC */ daLv4EdShutter_HIO_c(); - /* 80C5E72C */ ~daLv4EdShutter_HIO_c(); -}; - -struct dSv_info_c { - /* 800352B0 */ void offSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dEvLib_callback_c { - /* 80048940 */ void orderEvent(int, int, int); - /* 80C5E7D4 */ ~dEvLib_callback_c(); - /* 80C5E81C */ bool eventStart(); - /* 80C5E824 */ bool eventRun(); - /* 80C5E82C */ bool eventEnd(); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -181,16 +76,10 @@ extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP extern "C" void cLib_addCalc__FPfffff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -276,25 +165,30 @@ SECTION_DATA static u8 mode_proc[48] = { #pragma pop /* 80C5E984-80C5E9A4 -00001 0020+00 1/0 0/0 0/0 .data l_daLv4EdShutter_Method */ -SECTION_DATA static void* l_daLv4EdShutter_Method[8] = { - (void*)daLv4EdShutter_Create__FP10fopAc_ac_c, - (void*)daLv4EdShutter_Delete__FP16daLv4EdShutter_c, - (void*)daLv4EdShutter_Execute__FP16daLv4EdShutter_c, - (void*)NULL, - (void*)daLv4EdShutter_Draw__FP16daLv4EdShutter_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daLv4EdShutter_Method = { + (process_method_func)daLv4EdShutter_Create__FP10fopAc_ac_c, + (process_method_func)daLv4EdShutter_Delete__FP16daLv4EdShutter_c, + (process_method_func)daLv4EdShutter_Execute__FP16daLv4EdShutter_c, + 0, + (process_method_func)daLv4EdShutter_Draw__FP16daLv4EdShutter_c, }; /* 80C5E9A4-80C5E9D4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv4EdShutter */ -SECTION_DATA extern void* g_profile_Obj_Lv4EdShutter[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x009B0000, (void*)&g_fpcLf_Method, - (void*)0x000005DC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x027C0000, (void*)&l_daLv4EdShutter_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv4EdShutter = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv4EdShutter, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daLv4EdShutter_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 636, // mPriority + &l_daLv4EdShutter_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C5E9D4-80C5E9EC 0000D0 0018+00 3/3 0/0 0/0 .data __vt__17dEvLib_callback_c */ @@ -357,7 +251,8 @@ asm daLv4EdShutter_HIO_c::daLv4EdShutter_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4EdShutter/d_a_obj_lv4EdShutter/__dt__14mDoHIO_entry_cFv.s" } @@ -670,7 +565,8 @@ static asm void func_80C5E7CC() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dEvLib_callback_c::~dEvLib_callback_c() { +// asm dEvLib_callback_c::~dEvLib_callback_c() { +extern "C" asm void __dt__17dEvLib_callback_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4EdShutter/d_a_obj_lv4EdShutter/__dt__17dEvLib_callback_cFv.s" } @@ -678,17 +574,20 @@ asm dEvLib_callback_c::~dEvLib_callback_c() { /* 80C5E81C-80C5E824 000B5C 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventStart() { +// bool dEvLib_callback_c::eventStart() { +extern "C" bool eventStart__17dEvLib_callback_cFv() { return true; } /* 80C5E824-80C5E82C 000B64 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventRun() { +// bool dEvLib_callback_c::eventRun() { +extern "C" bool eventRun__17dEvLib_callback_cFv() { return true; } /* 80C5E82C-80C5E834 000B6C 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventEnd() { +// bool dEvLib_callback_c::eventEnd() { +extern "C" bool eventEnd__17dEvLib_callback_cFv() { return true; } diff --git a/rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall.cpp b/rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall.cpp index 3d8f5aa42da..7f6dd886109 100644 --- a/rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall.cpp +++ b/rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall.cpp @@ -1,164 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv4RailWall -// +/** + * @file d_a_obj_lv4RailWall.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjLv4Wall_c { - /* 80C60AC4 */ void initBaseMtx(); - /* 80C60B00 */ void setBaseMtx(); - /* 80C60B7C */ void Create(); - /* 80C60CD0 */ void CreateHeap(); - /* 80C60D40 */ void create1st(); - /* 80C60DC4 */ void Execute(f32 (**)[3][4]); - /* 80C60E90 */ void action(); - /* 80C60F4C */ void mode_init_wait(); - /* 80C60F58 */ void mode_wait(); - /* 80C61004 */ void mode_init_move(); - /* 80C61068 */ void mode_move(); - /* 80C613C0 */ void mode_init_dead(); - /* 80C613CC */ void mode_dead(); - /* 80C613D0 */ void eventStart(); - /* 80C6143C */ void Draw(); - /* 80C614E0 */ void Delete(); - /* 80C61940 */ ~daObjLv4Wall_c(); -}; - -struct cXyz {}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); - /* 8006FB10 */ void StartQuake(int, int, cXyz); - /* 8006FD94 */ void StopQuake(int); -}; - -struct dSv_memBit_c { - /* 80034934 */ void isDungeonItem(int) const; -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dEvLib_callback_c { - /* 8004886C */ void eventUpdate(); - /* 80C618E0 */ ~dEvLib_callback_c(); - /* 80C61928 */ bool eventStart(); - /* 80C61930 */ bool eventRun(); - /* 80C61938 */ bool eventEnd(); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80C616F0 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct dBgW {}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80C617BC */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80C6174C */ ~dBgS_AcchCir(); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); -}; - -struct cM3dGCyl { - /* 80C61660 */ ~cM3dGCyl(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 80C616A8 */ ~cM3dGAab(); -}; - -struct cCcD_GStts { - /* 80C61898 */ ~cCcD_GStts(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -251,13 +98,9 @@ extern "C" void cLib_chaseF__FPfff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -266,8 +109,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_80C61D38[4]; @@ -598,25 +439,30 @@ asm void daObjLv4Wall_c::Delete() { /* ############################################################################################## */ /* 80C61C28-80C61C48 -00001 0020+00 1/0 0/0 0/0 .data daObjLv4Wall_METHODS */ -SECTION_DATA static void* daObjLv4Wall_METHODS[8] = { - (void*)daObjLv4Wall_create1st__FP14daObjLv4Wall_c, - (void*)daObjLv4Wall_MoveBGDelete__FP14daObjLv4Wall_c, - (void*)daObjLv4Wall_MoveBGExecute__FP14daObjLv4Wall_c, - (void*)NULL, - (void*)daObjLv4Wall_MoveBGDraw__FP14daObjLv4Wall_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjLv4Wall_METHODS = { + (process_method_func)daObjLv4Wall_create1st__FP14daObjLv4Wall_c, + (process_method_func)daObjLv4Wall_MoveBGDelete__FP14daObjLv4Wall_c, + (process_method_func)daObjLv4Wall_MoveBGExecute__FP14daObjLv4Wall_c, + 0, + (process_method_func)daObjLv4Wall_MoveBGDraw__FP14daObjLv4Wall_c, }; /* 80C61C48-80C61C78 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv4RailWall */ -SECTION_DATA extern void* g_profile_Obj_Lv4RailWall[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00BC0000, (void*)&g_fpcLf_Method, - (void*)0x0000095C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x023E0000, (void*)&daObjLv4Wall_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv4RailWall = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv4RailWall, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjLv4Wall_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 574, // mPriority + &daObjLv4Wall_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C61C78-80C61C84 0000BC 000C+00 2/2 0/0 0/0 .data __vt__12dBgS_AcchCir */ @@ -714,7 +560,8 @@ static asm void daObjLv4Wall_create1st(daObjLv4Wall_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall/__dt__8cM3dGCylFv.s" } @@ -724,7 +571,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall/__dt__8cM3dGAabFv.s" } @@ -734,7 +582,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall/__dt__10dCcD_GSttsFv.s" } @@ -744,7 +593,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall/__dt__12dBgS_AcchCirFv.s" } @@ -754,7 +604,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall/__dt__12dBgS_ObjAcchFv.s" } @@ -797,7 +648,8 @@ static asm void daObjLv4Wall_MoveBGDraw(daObjLv4Wall_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall/__dt__10cCcD_GSttsFv.s" } @@ -807,7 +659,8 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dEvLib_callback_c::~dEvLib_callback_c() { +// asm dEvLib_callback_c::~dEvLib_callback_c() { +extern "C" asm void __dt__17dEvLib_callback_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall/__dt__17dEvLib_callback_cFv.s" } @@ -815,17 +668,20 @@ asm dEvLib_callback_c::~dEvLib_callback_c() { /* 80C61928-80C61930 000F28 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventStart() { +// bool dEvLib_callback_c::eventStart() { +extern "C" bool eventStart__17dEvLib_callback_cFv() { return true; } /* 80C61930-80C61938 000F30 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventRun() { +// bool dEvLib_callback_c::eventRun() { +extern "C" bool eventRun__17dEvLib_callback_cFv() { return true; } /* 80C61938-80C61940 000F38 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventEnd() { +// bool dEvLib_callback_c::eventEnd() { +extern "C" bool eventEnd__17dEvLib_callback_cFv() { return true; } diff --git a/rel/d/a/obj/d_a_obj_lv4SlideWall/d_a_obj_lv4SlideWall.cpp b/rel/d/a/obj/d_a_obj_lv4SlideWall/d_a_obj_lv4SlideWall.cpp index 30cb16e02b5..c61b88a7e40 100644 --- a/rel/d/a/obj/d_a_obj_lv4SlideWall/d_a_obj_lv4SlideWall.cpp +++ b/rel/d/a/obj/d_a_obj_lv4SlideWall/d_a_obj_lv4SlideWall.cpp @@ -1,110 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv4SlideWall -// +/** + * @file d_a_obj_lv4SlideWall.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv4SlideWall/d_a_obj_lv4SlideWall.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C61E68 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct daSldWall_c { - /* 80C61EB0 */ void setBaseMtx(); - /* 80C61F4C */ void CreateHeap(); - /* 80C61FB8 */ void create(); - /* 80C620E4 */ void Execute(f32 (**)[3][4]); - /* 80C62134 */ void moveWall(); - /* 80C62238 */ void init_modeWait(); - /* 80C62244 */ void modeWait(); - /* 80C62248 */ void init_modeMoveOpen(); - /* 80C62254 */ void modeMoveOpen(); - /* 80C62314 */ void init_modeMoveClose(); - /* 80C62320 */ void modeMoveClose(); - /* 80C623E0 */ void setSe(); - /* 80C6249C */ void Draw(); - /* 80C62540 */ void Delete(); -}; - -struct daSldWall_HIO_c { - /* 80C61E2C */ daSldWall_HIO_c(); - /* 80C625FC */ ~daSldWall_HIO_c(); -}; - -struct cXyz {}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -165,17 +67,11 @@ extern "C" void cLib_addCalc__FPfffff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -251,25 +147,30 @@ SECTION_DATA static u8 mode_proc[36] = { #pragma pop /* 80C62738-80C62758 -00001 0020+00 1/0 0/0 0/0 .data l_daSldWall_Method */ -SECTION_DATA static void* l_daSldWall_Method[8] = { - (void*)daSldWall_Create__FP10fopAc_ac_c, - (void*)daSldWall_Delete__FP11daSldWall_c, - (void*)daSldWall_Execute__FP11daSldWall_c, - (void*)NULL, - (void*)daSldWall_Draw__FP11daSldWall_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daSldWall_Method = { + (process_method_func)daSldWall_Create__FP10fopAc_ac_c, + (process_method_func)daSldWall_Delete__FP11daSldWall_c, + (process_method_func)daSldWall_Execute__FP11daSldWall_c, + 0, + (process_method_func)daSldWall_Draw__FP11daSldWall_c, }; /* 80C62758-80C62788 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv4SlideWall */ -SECTION_DATA extern void* g_profile_Obj_Lv4SlideWall[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x009E0000, (void*)&g_fpcLf_Method, - (void*)0x000005B4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x027F0000, (void*)&l_daSldWall_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv4SlideWall = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv4SlideWall, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daSldWall_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 639, // mPriority + &l_daSldWall_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C62788-80C627B0 0000B8 0028+00 1/1 0/0 0/0 .data __vt__11daSldWall_c */ @@ -314,7 +215,8 @@ asm daSldWall_HIO_c::daSldWall_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4SlideWall/d_a_obj_lv4SlideWall/__dt__14mDoHIO_entry_cFv.s" } diff --git a/rel/d/a/obj/d_a_obj_lv4bridge/d_a_obj_lv4bridge.cpp b/rel/d/a/obj/d_a_obj_lv4bridge/d_a_obj_lv4bridge.cpp index e613f8f7dc4..393a76d81da 100644 --- a/rel/d/a/obj/d_a_obj_lv4bridge/d_a_obj_lv4bridge.cpp +++ b/rel/d/a/obj/d_a_obj_lv4bridge/d_a_obj_lv4bridge.cpp @@ -1,117 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv4bridge -// +/** + * @file d_a_obj_lv4bridge.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv4bridge/d_a_obj_lv4bridge.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CDD4 */ void transM(cXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjLv4Brg_c { - /* 80C62878 */ void initBaseMtx(); - /* 80C628B4 */ void setBaseMtx(); - /* 80C62994 */ void Create(); - /* 80C62A2C */ void CreateHeap(); - /* 80C62A9C */ void create1st(); - /* 80C62B20 */ void Execute(f32 (**)[3][4]); - /* 80C62B6C */ void action(); - /* 80C62C28 */ void mode_init_wait(); - /* 80C62C34 */ void mode_wait(); - /* 80C62CE4 */ void mode_init_move(); - /* 80C62CFC */ void mode_move(); - /* 80C62E24 */ void mode_init_dead(); - /* 80C62E30 */ void mode_dead(); - /* 80C62E34 */ void eventStart(); - /* 80C62EA0 */ void Draw(); - /* 80C62F44 */ void Delete(); - /* 80C630C4 */ ~daObjLv4Brg_c(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); - /* 8006FB10 */ void StartQuake(int, int, cXyz); - /* 8006FD94 */ void StopQuake(int); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dEvLib_callback_c { - /* 8004886C */ void eventUpdate(); - /* 80048940 */ void orderEvent(int, int, int); - /* 80C63064 */ ~dEvLib_callback_c(); - /* 80C630AC */ bool eventStart(); - /* 80C630B4 */ bool eventRun(); - /* 80C630BC */ bool eventEnd(); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -181,18 +75,12 @@ extern "C" void cLib_chaseF__FPfff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_80C632B8[4]; @@ -486,25 +374,30 @@ asm void daObjLv4Brg_c::Delete() { /* ############################################################################################## */ /* 80C63208-80C63228 -00001 0020+00 1/0 0/0 0/0 .data daObjLv4Brg_METHODS */ -SECTION_DATA static void* daObjLv4Brg_METHODS[8] = { - (void*)daObjLv4Brg_create1st__FP13daObjLv4Brg_c, - (void*)daObjLv4Brg_MoveBGDelete__FP13daObjLv4Brg_c, - (void*)daObjLv4Brg_MoveBGExecute__FP13daObjLv4Brg_c, - (void*)NULL, - (void*)daObjLv4Brg_MoveBGDraw__FP13daObjLv4Brg_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjLv4Brg_METHODS = { + (process_method_func)daObjLv4Brg_create1st__FP13daObjLv4Brg_c, + (process_method_func)daObjLv4Brg_MoveBGDelete__FP13daObjLv4Brg_c, + (process_method_func)daObjLv4Brg_MoveBGExecute__FP13daObjLv4Brg_c, + 0, + (process_method_func)daObjLv4Brg_MoveBGDraw__FP13daObjLv4Brg_c, }; /* 80C63228-80C63258 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv4Bridge */ -SECTION_DATA extern void* g_profile_Obj_Lv4Bridge[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00C10000, (void*)&g_fpcLf_Method, - (void*)0x000005D0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02450000, (void*)&daObjLv4Brg_METHODS, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv4Bridge = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv4Bridge, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjLv4Brg_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 581, // mPriority + &daObjLv4Brg_METHODS, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C63258-80C63270 0000BC 0018+00 3/3 0/0 0/0 .data __vt__17dEvLib_callback_c */ @@ -585,7 +478,8 @@ static asm void daObjLv4Brg_MoveBGDraw(daObjLv4Brg_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dEvLib_callback_c::~dEvLib_callback_c() { +// asm dEvLib_callback_c::~dEvLib_callback_c() { +extern "C" asm void __dt__17dEvLib_callback_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4bridge/d_a_obj_lv4bridge/__dt__17dEvLib_callback_cFv.s" } @@ -593,17 +487,20 @@ asm dEvLib_callback_c::~dEvLib_callback_c() { /* 80C630AC-80C630B4 0008AC 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventStart() { +// bool dEvLib_callback_c::eventStart() { +extern "C" bool eventStart__17dEvLib_callback_cFv() { return true; } /* 80C630B4-80C630BC 0008B4 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventRun() { +// bool dEvLib_callback_c::eventRun() { +extern "C" bool eventRun__17dEvLib_callback_cFv() { return true; } /* 80C630BC-80C630C4 0008BC 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventEnd() { +// bool dEvLib_callback_c::eventEnd() { +extern "C" bool eventEnd__17dEvLib_callback_cFv() { return true; } diff --git a/rel/d/a/obj/d_a_obj_lv4chandelier/d_a_obj_lv4chandelier.cpp b/rel/d/a/obj/d_a_obj_lv4chandelier/d_a_obj_lv4chandelier.cpp index f0e8e9b85a8..288b1cc6a0a 100644 --- a/rel/d/a/obj/d_a_obj_lv4chandelier/d_a_obj_lv4chandelier.cpp +++ b/rel/d/a/obj/d_a_obj_lv4chandelier/d_a_obj_lv4chandelier.cpp @@ -1,142 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv4chandelier -// +/** + * @file d_a_obj_lv4chandelier.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv4chandelier/d_a_obj_lv4chandelier.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjSwChain_c { - /* 80C665A4 */ void checkTight(); -}; - -struct dMdl_obj_c { - /* 80C66558 */ dMdl_obj_c(); -}; - -struct daObjLv4Chan_c { - struct ChainPos { - /* 80C66564 */ ~ChainPos(); - /* 80C665A0 */ ChainPos(); - }; - - /* 80C63360 */ void create1st(); - /* 80C634CC */ void setMtxChain(daObjLv4Chan_c::ChainPos*, dMdl_obj_c*, int); - /* 80C636B4 */ void setMtx(); - /* 80C639B4 */ void rideActor(fopAc_ac_c*); - /* 80C63CFC */ void CreateHeap(); - /* 80C63FA8 */ void Create(); - /* 80C6449C */ void constraintChain(daObjLv4Chan_c::ChainPos*, int); - /* 80C64668 */ void constraintBase(); - /* 80C647FC */ void calcVec(daObjLv4Chan_c::ChainPos*, int); - /* 80C64878 */ void chkGnd(); - /* 80C648F4 */ void Execute(f32 (**)[3][4]); - /* 80C65F04 */ void Draw(); - /* 80C66114 */ void Delete(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dMdl_mng_c { - /* 8009C8D8 */ void entry(J3DModelData*, u16, int); -}; - -struct dMdl_c { - /* 8009C668 */ void entryObj(dMdl_obj_c*); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dBgW {}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjGndChk { - /* 80C6627C */ ~dBgS_ObjGndChk(); -}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; - -struct cBgS { - /* 800744A0 */ void GroundCross(cBgS_GndChk*); -}; - -struct _GXTexObj {}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -238,12 +108,6 @@ extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nwa__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXIdentity(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXConcat(); -extern "C" void PSMTXRotAxisRad(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void __construct_array(); extern "C" void __construct_new_array(); extern "C" void _savegpr_18(); @@ -260,8 +124,6 @@ extern "C" void _restgpr_24(); extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; @@ -270,11 +132,9 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" f32 Zero__4cXyz[3]; extern "C" u8 BaseY__4cXyz[12]; extern "C" u8 BaseZ__4cXyz[12]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -860,25 +720,30 @@ asm void daObjLv4Chan_c::Delete() { /* ############################################################################################## */ /* 80C669D4-80C669F4 -00001 0020+00 1/0 0/0 0/0 .data daObjLv4Chan_METHODS */ -SECTION_DATA static void* daObjLv4Chan_METHODS[8] = { - (void*)daObjLv4Chan_create1st__FP14daObjLv4Chan_c, - (void*)daObjLv4Chan_MoveBGDelete__FP14daObjLv4Chan_c, - (void*)daObjLv4Chan_MoveBGExecute__FP14daObjLv4Chan_c, - (void*)NULL, - (void*)daObjLv4Chan_MoveBGDraw__FP14daObjLv4Chan_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjLv4Chan_METHODS = { + (process_method_func)daObjLv4Chan_create1st__FP14daObjLv4Chan_c, + (process_method_func)daObjLv4Chan_MoveBGDelete__FP14daObjLv4Chan_c, + (process_method_func)daObjLv4Chan_MoveBGExecute__FP14daObjLv4Chan_c, + 0, + (process_method_func)daObjLv4Chan_MoveBGDraw__FP14daObjLv4Chan_c, }; /* 80C669F4-80C66A24 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv4Chan */ -SECTION_DATA extern void* g_profile_Obj_Lv4Chan[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00D30000, (void*)&g_fpcLf_Method, - (void*)0x000024A4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02A20000, (void*)&daObjLv4Chan_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv4Chan = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv4Chan, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjLv4Chan_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 674, // mPriority + &daObjLv4Chan_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C66A24-80C66A30 000094 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */ @@ -940,7 +805,8 @@ static asm void daObjLv4Chan_create1st(daObjLv4Chan_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +// asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +extern "C" asm void __dt__14dBgS_ObjGndChkFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4chandelier/d_a_obj_lv4chandelier/__dt__14dBgS_ObjGndChkFv.s" } @@ -1057,7 +923,8 @@ static asm void func_80C66550() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dMdl_obj_c::dMdl_obj_c() { +// asm dMdl_obj_c::dMdl_obj_c() { +extern "C" asm void __ct__10dMdl_obj_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4chandelier/d_a_obj_lv4chandelier/__ct__10dMdl_obj_cFv.s" } diff --git a/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand.cpp b/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand.cpp index d7672e9a420..da6fe540b6d 100644 --- a/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand.cpp +++ b/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand.cpp @@ -1,145 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv4digsand -// +/** + * @file d_a_obj_lv4digsand.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjL4DigSand_c { - /* 80C66B18 */ void initBaseMtx(); - /* 80C66B54 */ void setBaseMtx(); - /* 80C66BC8 */ void Create(); - /* 80C66C24 */ void CreateHeap(); - /* 80C66C94 */ void create1st(); - /* 80C66D40 */ void Execute(f32 (**)[3][4]); - /* 80C66DD0 */ void action(); - /* 80C66E74 */ void mode_init_wait(); - /* 80C66E80 */ void mode_wait(); - /* 80C66EAC */ void mode_init_dig(); - /* 80C66FFC */ void mode_dig(); - /* 80C670AC */ void mode_init_end(); - /* 80C67100 */ void mode_end(); - /* 80C67104 */ void Draw(); - /* 80C671A8 */ void Delete(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80C67398 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); -}; - -struct dBgW {}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjGndChk { - /* 80C66F84 */ ~dBgS_ObjGndChk(); -}; - -struct dBgS_ObjAcch { - /* 80C67464 */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80C673F4 */ ~dBgS_AcchCir(); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); -}; - -struct cM3dGCyl { - /* 80C67308 */ ~cM3dGCyl(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 80C67350 */ ~cM3dGAab(); -}; - -struct cCcD_GStts { - /* 80C67540 */ ~cCcD_GStts(); -}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; - -struct cBgS { - /* 800744A0 */ void GroundCross(cBgS_GndChk*); -}; - -struct J3DModel {}; // // Forward References: @@ -218,15 +84,11 @@ extern "C" void __dt__13cBgS_PolyInfoFv(); extern "C" void __dt__8cM3dGCirFv(); extern "C" void cLib_chaseF__FPfff(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_27(); extern "C" void _savegpr_29(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -234,8 +96,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" extern u8 data_80C67760[4]; // @@ -408,25 +268,30 @@ SECTION_RODATA static f32 const lit_3746 = -1000000000.0f; COMPILER_STRIP_GATE(0x80C675D4, &lit_3746); /* 80C67658-80C67678 -00001 0020+00 1/0 0/0 0/0 .data daObjL4DigSand_METHODS */ -SECTION_DATA static void* daObjL4DigSand_METHODS[8] = { - (void*)daObjL4DigSand_create1st__FP16daObjL4DigSand_c, - (void*)daObjL4DigSand_MoveBGDelete__FP16daObjL4DigSand_c, - (void*)daObjL4DigSand_MoveBGExecute__FP16daObjL4DigSand_c, - (void*)NULL, - (void*)daObjL4DigSand_MoveBGDraw__FP16daObjL4DigSand_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjL4DigSand_METHODS = { + (process_method_func)daObjL4DigSand_create1st__FP16daObjL4DigSand_c, + (process_method_func)daObjL4DigSand_MoveBGDelete__FP16daObjL4DigSand_c, + (process_method_func)daObjL4DigSand_MoveBGExecute__FP16daObjL4DigSand_c, + 0, + (process_method_func)daObjL4DigSand_MoveBGDraw__FP16daObjL4DigSand_c, }; /* 80C67678-80C676A8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv4DigSand */ -SECTION_DATA extern void* g_profile_Obj_Lv4DigSand[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00A90000, (void*)&g_fpcLf_Method, - (void*)0x00000944, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02270000, (void*)&daObjL4DigSand_METHODS, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv4DigSand = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv4DigSand, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjL4DigSand_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 551, // mPriority + &daObjL4DigSand_METHODS, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C676A8-80C676B4 0000BC 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ @@ -508,7 +373,8 @@ asm void daObjL4DigSand_c::mode_init_dig() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +// asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +extern "C" asm void __dt__14dBgS_ObjGndChkFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand/__dt__14dBgS_ObjGndChkFv.s" } @@ -612,7 +478,8 @@ static asm void daObjL4DigSand_create1st(daObjL4DigSand_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand/__dt__8cM3dGCylFv.s" } @@ -622,7 +489,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand/__dt__8cM3dGAabFv.s" } @@ -632,7 +500,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand/__dt__10dCcD_GSttsFv.s" } @@ -642,7 +511,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand/__dt__12dBgS_AcchCirFv.s" } @@ -652,7 +522,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand/__dt__12dBgS_ObjAcchFv.s" } @@ -695,7 +566,8 @@ static asm void daObjL4DigSand_MoveBGDraw(daObjL4DigSand_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_lv4prelvtr/d_a_obj_lv4prelvtr.cpp b/rel/d/a/obj/d_a_obj_lv4prelvtr/d_a_obj_lv4prelvtr.cpp index 5fdc7f9fa8d..b5c07952a72 100644 --- a/rel/d/a/obj/d_a_obj_lv4prelvtr/d_a_obj_lv4prelvtr.cpp +++ b/rel/d/a/obj/d_a_obj_lv4prelvtr/d_a_obj_lv4prelvtr.cpp @@ -1,73 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv4prelvtr -// +/** + * @file d_a_obj_lv4prelvtr.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv4prelvtr/d_a_obj_lv4prelvtr.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjPRElvtr_c { - /* 80C685F8 */ void create1st(); - /* 80C68688 */ void setMtx(); - /* 80C686F8 */ void CreateHeap(); - /* 80C68768 */ void Create(); - /* 80C68844 */ void Execute(f32 (**)[3][4]); - /* 80C68944 */ void Draw(); - /* 80C689E8 */ void Delete(); - /* 80C68AF0 */ ~daObjPRElvtr_c(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct J3DModel {}; // // Forward References: @@ -114,15 +52,9 @@ extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; // // Declarations: @@ -244,25 +176,30 @@ asm void daObjPRElvtr_c::Delete() { /* ############################################################################################## */ /* 80C68B9C-80C68BBC -00001 0020+00 1/0 0/0 0/0 .data daObjPRElvtr_METHODS */ -SECTION_DATA static void* daObjPRElvtr_METHODS[8] = { - (void*)daObjPRElvtr_create1st__FP14daObjPRElvtr_c, - (void*)daObjPRElvtr_MoveBGDelete__FP14daObjPRElvtr_c, - (void*)daObjPRElvtr_MoveBGExecute__FP14daObjPRElvtr_c, - (void*)NULL, - (void*)daObjPRElvtr_MoveBGDraw__FP14daObjPRElvtr_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjPRElvtr_METHODS = { + (process_method_func)daObjPRElvtr_create1st__FP14daObjPRElvtr_c, + (process_method_func)daObjPRElvtr_MoveBGDelete__FP14daObjPRElvtr_c, + (process_method_func)daObjPRElvtr_MoveBGExecute__FP14daObjPRElvtr_c, + 0, + (process_method_func)daObjPRElvtr_MoveBGDraw__FP14daObjPRElvtr_c, }; /* 80C68BBC-80C68BEC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_PRElvtr */ -SECTION_DATA extern void* g_profile_Obj_PRElvtr[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00CA0000, (void*)&g_fpcLf_Method, - (void*)0x00000610, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02990000, (void*)&daObjPRElvtr_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_PRElvtr = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_PRElvtr, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjPRElvtr_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 665, // mPriority + &daObjPRElvtr_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C68BEC-80C68C18 000054 002C+00 2/2 0/0 0/0 .data __vt__14daObjPRElvtr_c */ diff --git a/rel/d/a/obj/d_a_obj_lv4prwall/d_a_obj_lv4prwall.cpp b/rel/d/a/obj/d_a_obj_lv4prwall/d_a_obj_lv4prwall.cpp index 5ec0401daef..ef9a37d9382 100644 --- a/rel/d/a/obj/d_a_obj_lv4prwall/d_a_obj_lv4prwall.cpp +++ b/rel/d/a/obj/d_a_obj_lv4prwall/d_a_obj_lv4prwall.cpp @@ -1,103 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv4prwall -// +/** + * @file d_a_obj_lv4prwall.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv4prwall/d_a_obj_lv4prwall.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjLv4PRwall_c { - /* 80C68C98 */ void create1st(); - /* 80C68DD8 */ void setMtx(); - /* 80C68F20 */ void CreateHeap(); - /* 80C68FA0 */ void Create(); - /* 80C690D8 */ void Execute(f32 (**)[3][4]); - /* 80C696BC */ void Draw(); - /* 80C69760 */ void Delete(); - /* 80C69870 */ ~daObjLv4PRwall_c(); -}; - -struct cXyz {}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); - /* 8006FB10 */ void StartQuake(int, int, cXyz); - /* 8006FD94 */ void StopQuake(int); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -153,17 +61,11 @@ extern "C" void cM_rndFX__Ff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -359,25 +261,30 @@ asm void daObjLv4PRwall_c::Delete() { /* ############################################################################################## */ /* 80C6999C-80C699BC -00001 0020+00 1/0 0/0 0/0 .data daObjLv4PRwall_METHODS */ -SECTION_DATA static void* daObjLv4PRwall_METHODS[8] = { - (void*)daObjLv4PRwall_create1st__FP16daObjLv4PRwall_c, - (void*)daObjLv4PRwall_MoveBGDelete__FP16daObjLv4PRwall_c, - (void*)daObjLv4PRwall_MoveBGExecute__FP16daObjLv4PRwall_c, - (void*)NULL, - (void*)daObjLv4PRwall_MoveBGDraw__FP16daObjLv4PRwall_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjLv4PRwall_METHODS = { + (process_method_func)daObjLv4PRwall_create1st__FP16daObjLv4PRwall_c, + (process_method_func)daObjLv4PRwall_MoveBGDelete__FP16daObjLv4PRwall_c, + (process_method_func)daObjLv4PRwall_MoveBGExecute__FP16daObjLv4PRwall_c, + 0, + (process_method_func)daObjLv4PRwall_MoveBGDraw__FP16daObjLv4PRwall_c, }; /* 80C699BC-80C699EC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv4PRwall */ -SECTION_DATA extern void* g_profile_Obj_Lv4PRwall[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00D00000, (void*)&g_fpcLf_Method, - (void*)0x0000062C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02A00000, (void*)&daObjLv4PRwall_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv4PRwall = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv4PRwall, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjLv4PRwall_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 672, // mPriority + &daObjLv4PRwall_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C699EC-80C69A18 00005C 002C+00 2/2 0/0 0/0 .data __vt__16daObjLv4PRwall_c */ diff --git a/rel/d/a/obj/d_a_obj_lv4sand/d_a_obj_lv4sand.cpp b/rel/d/a/obj/d_a_obj_lv4sand/d_a_obj_lv4sand.cpp index f15ba79d11a..feb022d8365 100644 --- a/rel/d/a/obj/d_a_obj_lv4sand/d_a_obj_lv4sand.cpp +++ b/rel/d/a/obj/d_a_obj_lv4sand/d_a_obj_lv4sand.cpp @@ -1,128 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv4sand -// +/** + * @file d_a_obj_lv4sand.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv4sand/d_a_obj_lv4sand.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjLv4Sand_c { - /* 80C69A98 */ void initBaseMtx(); - /* 80C69AD4 */ void setBaseMtx(); - /* 80C69B50 */ void Create(); - /* 80C69C28 */ void CreateHeap(); - /* 80C69D8C */ void create1st(); - /* 80C69E10 */ void Execute(f32 (**)[3][4]); - /* 80C69F18 */ void action(); - /* 80C69FBC */ void mode_init_wait(); - /* 80C69FC8 */ void mode_wait(); - /* 80C6A01C */ void mode_init_move(); - /* 80C6A034 */ void mode_move(); - /* 80C6A09C */ void mode_init_dead(); - /* 80C6A0A8 */ void mode_dead(); - /* 80C6A0AC */ void eventStart(); - /* 80C6A0D0 */ void Draw(); - /* 80C6A18C */ void Delete(); - /* 80C6A30C */ ~daObjLv4Sand_c(); -}; - -struct dSv_memBit_c { - /* 80034934 */ void isDungeonItem(int) const; -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dEvLib_callback_c { - /* 80C6A2AC */ ~dEvLib_callback_c(); - /* 80C6A2F4 */ bool eventStart(); - /* 80C6A2FC */ bool eventRun(); - /* 80C6A304 */ bool eventEnd(); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80C69D44 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -193,20 +76,14 @@ extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_80C6A508[4]; @@ -331,25 +208,30 @@ SECTION_DATA static u8 l_func[36] = { #pragma pop /* 80C6A44C-80C6A46C -00001 0020+00 1/0 0/0 0/0 .data daObjLv4Sand_METHODS */ -SECTION_DATA static void* daObjLv4Sand_METHODS[8] = { - (void*)daObjLv4Sand_create1st__FP14daObjLv4Sand_c, - (void*)daObjLv4Sand_MoveBGDelete__FP14daObjLv4Sand_c, - (void*)daObjLv4Sand_MoveBGExecute__FP14daObjLv4Sand_c, - (void*)NULL, - (void*)daObjLv4Sand_MoveBGDraw__FP14daObjLv4Sand_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjLv4Sand_METHODS = { + (process_method_func)daObjLv4Sand_create1st__FP14daObjLv4Sand_c, + (process_method_func)daObjLv4Sand_MoveBGDelete__FP14daObjLv4Sand_c, + (process_method_func)daObjLv4Sand_MoveBGExecute__FP14daObjLv4Sand_c, + 0, + (process_method_func)daObjLv4Sand_MoveBGDraw__FP14daObjLv4Sand_c, }; /* 80C6A46C-80C6A49C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv4Sand */ -SECTION_DATA extern void* g_profile_Obj_Lv4Sand[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00BD0000, (void*)&g_fpcLf_Method, - (void*)0x000005C8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x023D0000, (void*)&daObjLv4Sand_METHODS, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv4Sand = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv4Sand, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjLv4Sand_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 573, // mPriority + &daObjLv4Sand_METHODS, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C6A49C-80C6A4B4 0000BC 0018+00 3/3 0/0 0/0 .data __vt__17dEvLib_callback_c */ @@ -383,7 +265,8 @@ asm void daObjLv4Sand_c::CreateHeap() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4sand/d_a_obj_lv4sand/__dt__12J3DFrameCtrlFv.s" } @@ -609,7 +492,8 @@ static asm void daObjLv4Sand_MoveBGDraw(daObjLv4Sand_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dEvLib_callback_c::~dEvLib_callback_c() { +// asm dEvLib_callback_c::~dEvLib_callback_c() { +extern "C" asm void __dt__17dEvLib_callback_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4sand/d_a_obj_lv4sand/__dt__17dEvLib_callback_cFv.s" } @@ -617,17 +501,20 @@ asm dEvLib_callback_c::~dEvLib_callback_c() { /* 80C6A2F4-80C6A2FC 0008D4 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventStart() { +// bool dEvLib_callback_c::eventStart() { +extern "C" bool eventStart__17dEvLib_callback_cFv() { return true; } /* 80C6A2FC-80C6A304 0008DC 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventRun() { +// bool dEvLib_callback_c::eventRun() { +extern "C" bool eventRun__17dEvLib_callback_cFv() { return true; } /* 80C6A304-80C6A30C 0008E4 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventEnd() { +// bool dEvLib_callback_c::eventEnd() { +extern "C" bool eventEnd__17dEvLib_callback_cFv() { return true; } diff --git a/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.cpp b/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.cpp index ca0d40d4597..2855d0111a8 100644 --- a/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.cpp +++ b/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.cpp @@ -1,161 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv5FloorBoard -// +/** + * @file d_a_obj_lv5FloorBoard.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C6A6B4 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct fOpAcm_HIO_entry_c { - /* 80C6A658 */ ~fOpAcm_HIO_entry_c(); -}; -struct daFlorBoad_c { - /* 80C6A6FC */ void setBaseMtx(); - /* 80C6A784 */ void CreateHeap(); - /* 80C6A7F0 */ void create(); - /* 80C6AAAC */ void Execute(f32 (**)[3][4]); - /* 80C6AB04 */ void procMain(); - /* 80C6AB90 */ void init_modeWait(); - /* 80C6ABAC */ void modeWait(); - /* 80C6AC9C */ void init_modeBreak(); - /* 80C6AD40 */ void modeBreak(); - /* 80C6AEB0 */ void Draw(); - /* 80C6AF54 */ void Delete(); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; -}; - -struct daFlorBoad_HIO_c { - /* 80C6A60C */ daFlorBoad_HIO_c(); - /* 80C6B058 */ ~daFlorBoad_HIO_c(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); - /* 80C6AA50 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 80084548 */ void GetTgHitGObj(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80C6A9C0 */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80C6AA08 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80C6B010 */ ~cCcD_GStts(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -231,13 +82,9 @@ extern "C" void SetH__8cM3dGCylFf(); extern "C" void SetR__8cM3dGCylFf(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -245,8 +92,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -316,25 +161,30 @@ SECTION_DATA static u8 mode_proc[24] = { #pragma pop /* 80C6B22C-80C6B24C -00001 0020+00 1/0 0/0 0/0 .data l_daFlorBoad_Method */ -SECTION_DATA static void* l_daFlorBoad_Method[8] = { - (void*)daFlorBoad_Create__FP10fopAc_ac_c, - (void*)daFlorBoad_Delete__FP12daFlorBoad_c, - (void*)daFlorBoad_Execute__FP12daFlorBoad_c, - (void*)NULL, - (void*)daFlorBoad_Draw__FP12daFlorBoad_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daFlorBoad_Method = { + (process_method_func)daFlorBoad_Create__FP10fopAc_ac_c, + (process_method_func)daFlorBoad_Delete__FP12daFlorBoad_c, + (process_method_func)daFlorBoad_Execute__FP12daFlorBoad_c, + 0, + (process_method_func)daFlorBoad_Draw__FP12daFlorBoad_c, }; /* 80C6B24C-80C6B27C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv5FBoard */ -SECTION_DATA extern void* g_profile_Obj_Lv5FBoard[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x004F0000, (void*)&g_fpcLf_Method, - (void*)0x00000734, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x021A0000, (void*)&l_daFlorBoad_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv5FBoard = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv5FBoard, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daFlorBoad_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 538, // mPriority + &l_daFlorBoad_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C6B27C-80C6B288 0000E4 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -414,7 +264,8 @@ asm daFlorBoad_HIO_c::daFlorBoad_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { +// asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { +extern "C" asm void __dt__18fOpAcm_HIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__18fOpAcm_HIO_entry_cFv.s" } @@ -424,7 +275,8 @@ asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__14mDoHIO_entry_cFv.s" } @@ -471,7 +323,8 @@ asm void daFlorBoad_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__8cM3dGCylFv.s" } @@ -481,7 +334,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__8cM3dGAabFv.s" } @@ -491,7 +345,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__10dCcD_GSttsFv.s" } @@ -670,7 +525,8 @@ static asm void daFlorBoad_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.cpp b/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.cpp index 1861b72c926..e7fdce89a23 100644 --- a/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.cpp +++ b/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.cpp @@ -1,170 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv5IceWall -// +/** + * @file d_a_obj_lv5IceWall.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C6B4D4 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct fOpAcm_HIO_entry_c { - /* 80C6B478 */ ~fOpAcm_HIO_entry_c(); -}; - -struct daIceWall_c { - /* 80C6B51C */ void setBaseMtx(); - /* 80C6B5E4 */ void CreateHeap(); - /* 80C6B69C */ void create(); - /* 80C6BB60 */ void Execute(f32 (**)[3][4]); - /* 80C6BBC4 */ void procMain(); - /* 80C6BC50 */ void init_modeWait(); - /* 80C6BC6C */ void modeWait(); - /* 80C6C170 */ void init_modeBreak(); - /* 80C6C1C0 */ void modeBreak(); - /* 80C6C374 */ void Draw(); - /* 80C6C44C */ void Delete(); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; -}; - -struct daIceWall_HIO_c { - /* 80C6B42C */ daIceWall_HIO_c(); - /* 80C6C550 */ ~daIceWall_HIO_c(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); - /* 80C6BB04 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 80084548 */ void GetTgHitGObj(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); - /* 80C6B924 */ ~dCcD_Cyl(); - /* 80C6B9F0 */ dCcD_Cyl(); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80C6BA74 */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80C6BABC */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80C6C508 */ ~cCcD_GStts(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -247,10 +89,6 @@ extern "C" void SetH__8cM3dGCylFf(); extern "C" void SetR__8cM3dGCylFf(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); extern "C" void __construct_array(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_23(); @@ -259,8 +97,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_23(); extern "C" void _restgpr_25(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -268,8 +104,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -339,25 +173,30 @@ SECTION_DATA static u8 mode_proc[24] = { #pragma pop /* 80C6C75C-80C6C77C -00001 0020+00 1/0 0/0 0/0 .data l_daIceWall_Method */ -SECTION_DATA static void* l_daIceWall_Method[8] = { - (void*)daIceWall_Create__FP10fopAc_ac_c, - (void*)daIceWall_Delete__FP11daIceWall_c, - (void*)daIceWall_Execute__FP11daIceWall_c, - (void*)NULL, - (void*)daIceWall_Draw__FP11daIceWall_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daIceWall_Method = { + (process_method_func)daIceWall_Create__FP10fopAc_ac_c, + (process_method_func)daIceWall_Delete__FP11daIceWall_c, + (process_method_func)daIceWall_Execute__FP11daIceWall_c, + 0, + (process_method_func)daIceWall_Draw__FP11daIceWall_c, }; /* 80C6C77C-80C6C7AC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_IceWall */ -SECTION_DATA extern void* g_profile_Obj_IceWall[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x004D0000, (void*)&g_fpcLf_Method, - (void*)0x00000884, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02180000, (void*)&l_daIceWall_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_IceWall = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_IceWall, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daIceWall_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 536, // mPriority + &l_daIceWall_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C6C7AC-80C6C7B8 0000E4 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -437,7 +276,8 @@ asm daIceWall_HIO_c::daIceWall_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { +// asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { +extern "C" asm void __dt__18fOpAcm_HIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__18fOpAcm_HIO_entry_cFv.s" } @@ -447,7 +287,8 @@ asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__14mDoHIO_entry_cFv.s" } @@ -522,7 +363,8 @@ asm void daIceWall_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Cyl::~dCcD_Cyl() { +// asm dCcD_Cyl::~dCcD_Cyl() { +extern "C" asm void __dt__8dCcD_CylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__8dCcD_CylFv.s" } @@ -532,7 +374,8 @@ asm dCcD_Cyl::~dCcD_Cyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Cyl::dCcD_Cyl() { +// asm dCcD_Cyl::dCcD_Cyl() { +extern "C" asm void __ct__8dCcD_CylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__ct__8dCcD_CylFv.s" } @@ -542,7 +385,8 @@ asm dCcD_Cyl::dCcD_Cyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__8cM3dGCylFv.s" } @@ -552,7 +396,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__8cM3dGAabFv.s" } @@ -562,7 +407,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__10dCcD_GSttsFv.s" } @@ -812,7 +658,8 @@ static asm void daIceWall_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.cpp b/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.cpp index 1431d801b7f..d035f8ca59b 100644 --- a/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.cpp +++ b/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.cpp @@ -1,161 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv5SwIce -// +/** + * @file d_a_obj_lv5SwIce.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C6C9D8 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct fOpAcm_HIO_entry_c { - /* 80C6C97C */ ~fOpAcm_HIO_entry_c(); -}; -struct daLv5SwIce_c { - /* 80C6CA20 */ void setBaseMtx(); - /* 80C6CAA8 */ void CreateHeap(); - /* 80C6CB14 */ void create(); - /* 80C6CDD0 */ void Execute(f32 (**)[3][4]); - /* 80C6CE28 */ void procMain(); - /* 80C6CEB4 */ void init_modeWait(); - /* 80C6CED0 */ void modeWait(); - /* 80C6D0F4 */ void init_modeBreak(); - /* 80C6D144 */ void modeBreak(); - /* 80C6D260 */ void Draw(); - /* 80C6D314 */ void Delete(); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; -}; - -struct daLv5SwIce_HIO_c { - /* 80C6C94C */ daLv5SwIce_HIO_c(); - /* 80C6D418 */ ~daLv5SwIce_HIO_c(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); - /* 80C6CD74 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 80084548 */ void GetTgHitGObj(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80C6CCE4 */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80C6CD2C */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80C6D3D0 */ ~cCcD_GStts(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -232,13 +83,9 @@ extern "C" void SetH__8cM3dGCylFf(); extern "C" void SetR__8cM3dGCylFf(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_24(); extern "C" void _restgpr_24(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -246,8 +93,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -313,25 +158,30 @@ SECTION_DATA static u8 mode_proc[24] = { #pragma pop /* 80C6D5F4-80C6D614 -00001 0020+00 1/0 0/0 0/0 .data l_daLv5SwIce_Method */ -SECTION_DATA static void* l_daLv5SwIce_Method[8] = { - (void*)daLv5SwIce_Create__FP10fopAc_ac_c, - (void*)daLv5SwIce_Delete__FP12daLv5SwIce_c, - (void*)daLv5SwIce_Execute__FP12daLv5SwIce_c, - (void*)NULL, - (void*)daLv5SwIce_Draw__FP12daLv5SwIce_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daLv5SwIce_Method = { + (process_method_func)daLv5SwIce_Create__FP10fopAc_ac_c, + (process_method_func)daLv5SwIce_Delete__FP12daLv5SwIce_c, + (process_method_func)daLv5SwIce_Execute__FP12daLv5SwIce_c, + 0, + (process_method_func)daLv5SwIce_Draw__FP12daLv5SwIce_c, }; /* 80C6D614-80C6D644 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv5SwIce */ -SECTION_DATA extern void* g_profile_Obj_Lv5SwIce[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x004E0000, (void*)&g_fpcLf_Method, - (void*)0x00000738, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02190000, (void*)&l_daLv5SwIce_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv5SwIce = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv5SwIce, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daLv5SwIce_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 537, // mPriority + &l_daLv5SwIce_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C6D644-80C6D650 0000E4 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -411,7 +261,8 @@ asm daLv5SwIce_HIO_c::daLv5SwIce_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { +// asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { +extern "C" asm void __dt__18fOpAcm_HIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__18fOpAcm_HIO_entry_cFv.s" } @@ -421,7 +272,8 @@ asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__14mDoHIO_entry_cFv.s" } @@ -468,7 +320,8 @@ asm void daLv5SwIce_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__8cM3dGCylFv.s" } @@ -478,7 +331,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__8cM3dGAabFv.s" } @@ -488,7 +342,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__10dCcD_GSttsFv.s" } @@ -708,7 +563,8 @@ static asm void daLv5SwIce_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.cpp b/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.cpp index 0ed155e617c..899ecdb256e 100644 --- a/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.cpp +++ b/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.cpp @@ -1,79 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv5ychndlr -// +/** + * @file d_a_obj_lv5ychndlr.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjYchndlr_c { - /* 80C6D758 */ void create1st(); - /* 80C6D7E0 */ void setMtx(); - /* 80C6D9A8 */ void rideActor(fopAc_ac_c*); - /* 80C6DA5C */ void CreateHeap(); - /* 80C6DB5C */ void Create(); - /* 80C6DC64 */ void Execute(f32 (**)[3][4]); - /* 80C6E300 */ void Draw(); - /* 80C6E3C8 */ void Delete(); - /* 80C6E808 */ ~daObjYchndlr_c(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct J3DModel {}; // // Forward References: @@ -140,9 +73,6 @@ extern "C" void cM_atan2s__Fff(); extern "C" void SetC__8cM3dGCylFRC4cXyz(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void _savegpr_21(); @@ -155,8 +85,6 @@ extern "C" void _restgpr_24(); extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -165,9 +93,7 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" f32 Zero__4cXyz[3]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // @@ -451,25 +377,30 @@ asm void daObjYchndlr_c::Delete() { /* ############################################################################################## */ /* 80C6EAB8-80C6EAD8 -00001 0020+00 1/0 0/0 0/0 .data daObjYchndlr_METHODS */ -SECTION_DATA static void* daObjYchndlr_METHODS[8] = { - (void*)daObjYchndlr_create1st__FP14daObjYchndlr_c, - (void*)daObjYchndlr_MoveBGDelete__FP14daObjYchndlr_c, - (void*)daObjYchndlr_MoveBGExecute__FP14daObjYchndlr_c, - (void*)NULL, - (void*)daObjYchndlr_MoveBGDraw__FP14daObjYchndlr_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjYchndlr_METHODS = { + (process_method_func)daObjYchndlr_create1st__FP14daObjYchndlr_c, + (process_method_func)daObjYchndlr_MoveBGDelete__FP14daObjYchndlr_c, + (process_method_func)daObjYchndlr_MoveBGExecute__FP14daObjYchndlr_c, + 0, + (process_method_func)daObjYchndlr_MoveBGDraw__FP14daObjYchndlr_c, }; /* 80C6EAD8-80C6EB08 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Ychndlr */ -SECTION_DATA extern void* g_profile_Obj_Ychndlr[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00C90000, (void*)&g_fpcLf_Method, - (void*)0x00000CA0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02980000, (void*)&daObjYchndlr_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Ychndlr = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Ychndlr, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjYchndlr_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 664, // mPriority + &daObjYchndlr_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C6EB08-80C6EB14 000114 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */ diff --git a/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.cpp b/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.cpp index 7263bc6565d..a301a14d08c 100644 --- a/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.cpp +++ b/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.cpp @@ -1,123 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv5yiblltray -// +/** + * @file d_a_obj_lv5yiblltray.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjYIblltray_c { - /* 80C6EBF8 */ void create1st(); - /* 80C6EC88 */ void setMtx(); - /* 80C6EDA8 */ void CreateHeap(); - /* 80C6EEFC */ void Create(); - /* 80C6F1E8 */ void rideActor(fopAc_ac_c*); - /* 80C6F23C */ void sendBall(unsigned int); - /* 80C6F440 */ void onAttention(); - /* 80C6F450 */ void offAttention(); - /* 80C6F460 */ void Execute(f32 (**)[3][4]); - /* 80C702E0 */ void initRotTo(); - /* 80C70330 */ void Draw(); - /* 80C70408 */ void Delete(); - /* 80C7088C */ ~daObjYIblltray_c(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 800352B0 */ void offSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW_Base {}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80C70554 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -205,16 +94,10 @@ extern "C" void SetR__8cM3dGCylFf(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXInverse(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -223,8 +106,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -627,25 +508,30 @@ asm void daObjYIblltray_c::Delete() { /* ############################################################################################## */ /* 80C70AA4-80C70AC4 -00001 0020+00 1/0 0/0 0/0 .data daObjYIblltray_METHODS */ -SECTION_DATA static void* daObjYIblltray_METHODS[8] = { - (void*)daObjYIblltray_create1st__FP16daObjYIblltray_c, - (void*)daObjYIblltray_MoveBGDelete__FP16daObjYIblltray_c, - (void*)daObjYIblltray_MoveBGExecute__FP16daObjYIblltray_c, - (void*)NULL, - (void*)daObjYIblltray_MoveBGDraw__FP16daObjYIblltray_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjYIblltray_METHODS = { + (process_method_func)daObjYIblltray_create1st__FP16daObjYIblltray_c, + (process_method_func)daObjYIblltray_MoveBGDelete__FP16daObjYIblltray_c, + (process_method_func)daObjYIblltray_MoveBGExecute__FP16daObjYIblltray_c, + 0, + (process_method_func)daObjYIblltray_MoveBGDraw__FP16daObjYIblltray_c, }; /* 80C70AC4-80C70AF4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_YIblltray */ -SECTION_DATA extern void* g_profile_Obj_YIblltray[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00CC0000, (void*)&g_fpcLf_Method, - (void*)0x00000A94, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x029B0000, (void*)&daObjYIblltray_METHODS, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_YIblltray = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_YIblltray, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjYIblltray_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 667, // mPriority + &daObjYIblltray_METHODS, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C70AF4-80C70B00 0000BC 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */ @@ -713,7 +599,8 @@ static asm void daObjYIblltray_create1st(daObjYIblltray_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate.cpp b/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate.cpp index 9f4e8979cbf..79cf85215d7 100644 --- a/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate.cpp +++ b/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate.cpp @@ -1,184 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv6ChangeGate -// +/** + * @file d_a_obj_lv6ChangeGate.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C70CF0 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct fOpAcm_HIO_entry_c { - /* 80C70C94 */ ~fOpAcm_HIO_entry_c(); -}; - -struct daLv6ChangeGate_c { - /* 80C70D38 */ void setBaseMtx(); - /* 80C70DD4 */ void CreateHeap(); - /* 80C70E40 */ void create(); - /* 80C712A8 */ void isSwitch(); - /* 80C712F4 */ void Execute(f32 (**)[3][4]); - /* 80C71494 */ void moveGate(); - /* 80C715BC */ void eventStart(); - /* 80C715F4 */ void init_modeWait(); - /* 80C71600 */ void modeWait(); - /* 80C71604 */ void init_modeSlideRight(); - /* 80C716B4 */ void modeSlideRight(); - /* 80C7183C */ void init_modeSlideLeft(); - /* 80C718EC */ void modeSlideLeft(); - /* 80C71A74 */ void init_modeBreak(); - /* 80C71AF8 */ void modeBreak(); - /* 80C71D40 */ void Draw(); - /* 80C71DE4 */ void Delete(); - /* 80C72034 */ ~daLv6ChangeGate_c(); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; -}; - -struct daLv6ChangeGate_HIO_c { - /* 80C70C4C */ daLv6ChangeGate_HIO_c(); - /* 80C71EE8 */ ~daLv6ChangeGate_HIO_c(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dEvLib_callback_c { - /* 8004886C */ void eventUpdate(); - /* 80048940 */ void orderEvent(int, int, int); - /* 80C71FD4 */ ~dEvLib_callback_c(); - /* 80C7201C */ bool eventStart(); - /* 80C72024 */ bool eventRun(); - /* 80C7202C */ bool eventEnd(); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80C7124C */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 80084548 */ void GetTgHitGObj(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); - /* 80C7106C */ ~dCcD_Cyl(); - /* 80C71138 */ dCcD_Cyl(); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80C711BC */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80C71204 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80C71EA0 */ ~cCcD_GStts(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -276,10 +104,6 @@ extern "C" void cLib_addCalc__FPfffff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void __ptmf_scall(); @@ -289,8 +113,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_23(); extern "C" void _restgpr_25(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -299,8 +121,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -395,25 +215,30 @@ SECTION_DATA static u8 mode_proc[48] = { #pragma pop /* 80C72270-80C72290 -00001 0020+00 1/0 0/0 0/0 .data l_daLv6ChangeGate_Method */ -SECTION_DATA static void* l_daLv6ChangeGate_Method[8] = { - (void*)daLv6ChangeGate_Create__FP10fopAc_ac_c, - (void*)daLv6ChangeGate_Delete__FP17daLv6ChangeGate_c, - (void*)daLv6ChangeGate_Execute__FP17daLv6ChangeGate_c, - (void*)NULL, - (void*)daLv6ChangeGate_Draw__FP17daLv6ChangeGate_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daLv6ChangeGate_Method = { + (process_method_func)daLv6ChangeGate_Create__FP10fopAc_ac_c, + (process_method_func)daLv6ChangeGate_Delete__FP17daLv6ChangeGate_c, + (process_method_func)daLv6ChangeGate_Execute__FP17daLv6ChangeGate_c, + 0, + (process_method_func)daLv6ChangeGate_Draw__FP17daLv6ChangeGate_c, }; /* 80C72290-80C722C0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv6ChgGate */ -SECTION_DATA extern void* g_profile_Obj_Lv6ChgGate[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00980000, (void*)&g_fpcLf_Method, - (void*)0x000014DC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02720000, (void*)&l_daLv6ChangeGate_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv6ChgGate = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv6ChgGate, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daLv6ChangeGate_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 626, // mPriority + &l_daLv6ChangeGate_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C722C0-80C722CC 000114 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -511,7 +336,8 @@ asm daLv6ChangeGate_HIO_c::daLv6ChangeGate_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { +// asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { +extern "C" asm void __dt__18fOpAcm_HIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate/__dt__18fOpAcm_HIO_entry_cFv.s" } @@ -521,7 +347,8 @@ asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate/__dt__14mDoHIO_entry_cFv.s" } @@ -595,7 +422,8 @@ asm void daLv6ChangeGate_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Cyl::~dCcD_Cyl() { +// asm dCcD_Cyl::~dCcD_Cyl() { +extern "C" asm void __dt__8dCcD_CylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate/__dt__8dCcD_CylFv.s" } @@ -605,7 +433,8 @@ asm dCcD_Cyl::~dCcD_Cyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Cyl::dCcD_Cyl() { +// asm dCcD_Cyl::dCcD_Cyl() { +extern "C" asm void __ct__8dCcD_CylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate/__ct__8dCcD_CylFv.s" } @@ -615,7 +444,8 @@ asm dCcD_Cyl::dCcD_Cyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate/__dt__8cM3dGCylFv.s" } @@ -625,7 +455,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate/__dt__8cM3dGAabFv.s" } @@ -635,7 +466,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate/__dt__10dCcD_GSttsFv.s" } @@ -875,7 +707,8 @@ static asm void daLv6ChangeGate_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate/__dt__10cCcD_GSttsFv.s" } @@ -932,7 +765,8 @@ static asm void func_80C71FCC() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dEvLib_callback_c::~dEvLib_callback_c() { +// asm dEvLib_callback_c::~dEvLib_callback_c() { +extern "C" asm void __dt__17dEvLib_callback_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate/__dt__17dEvLib_callback_cFv.s" } @@ -940,17 +774,20 @@ asm dEvLib_callback_c::~dEvLib_callback_c() { /* 80C7201C-80C72024 0014BC 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventStart() { +// bool dEvLib_callback_c::eventStart() { +extern "C" bool eventStart__17dEvLib_callback_cFv() { return true; } /* 80C72024-80C7202C 0014C4 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventRun() { +// bool dEvLib_callback_c::eventRun() { +extern "C" bool eventRun__17dEvLib_callback_cFv() { return true; } /* 80C7202C-80C72034 0014CC 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventEnd() { +// bool dEvLib_callback_c::eventEnd() { +extern "C" bool eventEnd__17dEvLib_callback_cFv() { return true; } diff --git a/rel/d/a/obj/d_a_obj_lv6FurikoTrap/d_a_obj_lv6FurikoTrap.cpp b/rel/d/a/obj/d_a_obj_lv6FurikoTrap/d_a_obj_lv6FurikoTrap.cpp index fee82ed1d4f..027c11ed2f6 100644 --- a/rel/d/a/obj/d_a_obj_lv6FurikoTrap/d_a_obj_lv6FurikoTrap.cpp +++ b/rel/d/a/obj/d_a_obj_lv6FurikoTrap/d_a_obj_lv6FurikoTrap.cpp @@ -1,139 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv6FurikoTrap -// +/** + * @file d_a_obj_lv6FurikoTrap.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv6FurikoTrap/d_a_obj_lv6FurikoTrap.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C724C8 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct daLv6FurikoTrap_c { - /* 80C72510 */ void setBaseMtx(); - /* 80C72598 */ void CreateHeap(); - /* 80C72604 */ void create(); - /* 80C729B4 */ void Execute(f32 (**)[3][4]); - /* 80C72CA8 */ void move(); - /* 80C72D24 */ void init_modeMove(); - /* 80C72D38 */ void modeMove(); - /* 80C72EE0 */ void Draw(); - /* 80C72F94 */ void Delete(); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDSph[64]; -}; - -struct daLv6FurikoTrap_HIO_c { - /* 80C7248C */ daLv6FurikoTrap_HIO_c(); - /* 80C73050 */ ~daLv6FurikoTrap_HIO_c(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcSph {}; - -struct dCcD_Sph { - /* 80084A34 */ void Set(dCcD_SrcSph const&); - /* 80C727D4 */ ~dCcD_Sph(); - /* 80C728A0 */ dCcD_Sph(); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cM3dGSph { - /* 8026F648 */ void SetC(cXyz const&); - /* 8026F708 */ void SetR(f32); - /* 80C72924 */ ~cM3dGSph(); -}; -struct cM3dGAab { - /* 80C7296C */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -202,10 +75,6 @@ extern "C" void SetC__8cM3dGSphFRC4cXyz(); extern "C" void SetR__8cM3dGSphFf(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); extern "C" void __construct_array(); extern "C" void __ptmf_scall(); extern "C" void __cvt_fp2unsigned(); @@ -215,8 +84,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_18(); extern "C" void _restgpr_25(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; @@ -224,8 +91,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -274,25 +139,30 @@ SECTION_DATA static u8 mode_proc[12] = { }; /* 80C73214-80C73234 -00001 0020+00 1/0 0/0 0/0 .data l_daLv6FurikoTrap_Method */ -SECTION_DATA static void* l_daLv6FurikoTrap_Method[8] = { - (void*)daLv6FurikoTrap_Create__FP10fopAc_ac_c, - (void*)daLv6FurikoTrap_Delete__FP17daLv6FurikoTrap_c, - (void*)daLv6FurikoTrap_Execute__FP17daLv6FurikoTrap_c, - (void*)NULL, - (void*)daLv6FurikoTrap_Draw__FP17daLv6FurikoTrap_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daLv6FurikoTrap_Method = { + (process_method_func)daLv6FurikoTrap_Create__FP10fopAc_ac_c, + (process_method_func)daLv6FurikoTrap_Delete__FP17daLv6FurikoTrap_c, + (process_method_func)daLv6FurikoTrap_Execute__FP17daLv6FurikoTrap_c, + 0, + (process_method_func)daLv6FurikoTrap_Draw__FP17daLv6FurikoTrap_c, }; /* 80C73234-80C73264 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv6FuriTrap */ -SECTION_DATA extern void* g_profile_Obj_Lv6FuriTrap[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00990000, (void*)&g_fpcLf_Method, - (void*)0x00001D18, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02730000, (void*)&l_daLv6FurikoTrap_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv6FuriTrap = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv6FuriTrap, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daLv6FurikoTrap_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 627, // mPriority + &l_daLv6FurikoTrap_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C73264-80C73270 0000C0 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */ @@ -351,7 +221,8 @@ asm daLv6FurikoTrap_HIO_c::daLv6FurikoTrap_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6FurikoTrap/d_a_obj_lv6FurikoTrap/__dt__14mDoHIO_entry_cFv.s" } @@ -400,7 +271,8 @@ asm void daLv6FurikoTrap_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Sph::~dCcD_Sph() { +// asm dCcD_Sph::~dCcD_Sph() { +extern "C" asm void __dt__8dCcD_SphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6FurikoTrap/d_a_obj_lv6FurikoTrap/__dt__8dCcD_SphFv.s" } @@ -410,7 +282,8 @@ asm dCcD_Sph::~dCcD_Sph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Sph::dCcD_Sph() { +// asm dCcD_Sph::dCcD_Sph() { +extern "C" asm void __ct__8dCcD_SphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6FurikoTrap/d_a_obj_lv6FurikoTrap/__ct__8dCcD_SphFv.s" } @@ -420,7 +293,8 @@ asm dCcD_Sph::dCcD_Sph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { +// asm cM3dGSph::~cM3dGSph() { +extern "C" asm void __dt__8cM3dGSphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6FurikoTrap/d_a_obj_lv6FurikoTrap/__dt__8cM3dGSphFv.s" } @@ -430,7 +304,8 @@ asm cM3dGSph::~cM3dGSph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6FurikoTrap/d_a_obj_lv6FurikoTrap/__dt__8cM3dGAabFv.s" } diff --git a/rel/d/a/obj/d_a_obj_lv6Lblock/d_a_obj_lv6Lblock.cpp b/rel/d/a/obj/d_a_obj_lv6Lblock/d_a_obj_lv6Lblock.cpp index ee8455b6fab..5a3f34d93d3 100644 --- a/rel/d/a/obj/d_a_obj_lv6Lblock/d_a_obj_lv6Lblock.cpp +++ b/rel/d/a/obj/d_a_obj_lv6Lblock/d_a_obj_lv6Lblock.cpp @@ -1,104 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv6Lblock -// +/** + * @file d_a_obj_lv6Lblock.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv6Lblock/d_a_obj_lv6Lblock.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C7341C */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct daLv6Lblock_c { - /* 80C73464 */ void setBaseMtx(); - /* 80C734EC */ void CreateHeap(); - /* 80C73558 */ void create(); - /* 80C736C0 */ void isSwitch(); - /* 80C7370C */ void Execute(f32 (**)[3][4]); - /* 80C7375C */ void moveBlock(); - /* 80C73850 */ void init_modeWait(); - /* 80C7385C */ void modeWait(); - /* 80C73860 */ void init_modeLiftUp(); - /* 80C7386C */ void modeLiftUp(); - /* 80C7398C */ void init_modeLiftDown(); - /* 80C73998 */ void modeLiftDown(); - /* 80C73AB0 */ void Draw(); - /* 80C73B54 */ void Delete(); -}; - -struct daLv6Lblock_HIO_c { - /* 80C733EC */ daLv6Lblock_HIO_c(); - /* 80C73C10 */ ~daLv6Lblock_HIO_c(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -157,17 +65,11 @@ extern "C" void cLib_addCalc__FPfffff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -244,25 +146,30 @@ SECTION_DATA static u8 mode_proc[36] = { #pragma pop /* 80C73D54-80C73D74 -00001 0020+00 1/0 0/0 0/0 .data l_daLv6Lblock_Method */ -SECTION_DATA static void* l_daLv6Lblock_Method[8] = { - (void*)daLv6Lblock_Create__FP10fopAc_ac_c, - (void*)daLv6Lblock_Delete__FP13daLv6Lblock_c, - (void*)daLv6Lblock_Execute__FP13daLv6Lblock_c, - (void*)NULL, - (void*)daLv6Lblock_Draw__FP13daLv6Lblock_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daLv6Lblock_Method = { + (process_method_func)daLv6Lblock_Create__FP10fopAc_ac_c, + (process_method_func)daLv6Lblock_Delete__FP13daLv6Lblock_c, + (process_method_func)daLv6Lblock_Execute__FP13daLv6Lblock_c, + 0, + (process_method_func)daLv6Lblock_Draw__FP13daLv6Lblock_c, }; /* 80C73D74-80C73DA4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv6Lblock */ -SECTION_DATA extern void* g_profile_Obj_Lv6Lblock[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00970000, (void*)&g_fpcLf_Method, - (void*)0x000005B8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02710000, (void*)&l_daLv6Lblock_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv6Lblock = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv6Lblock, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daLv6Lblock_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 625, // mPriority + &l_daLv6Lblock_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C73DA4-80C73DCC 0000C0 0028+00 1/1 0/0 0/0 .data __vt__13daLv6Lblock_c */ @@ -307,7 +214,8 @@ asm daLv6Lblock_HIO_c::daLv6Lblock_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6Lblock/d_a_obj_lv6Lblock/__dt__14mDoHIO_entry_cFv.s" } diff --git a/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate.cpp b/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate.cpp index 659279b7282..b2b201fa857 100644 --- a/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate.cpp +++ b/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate.cpp @@ -1,194 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv6SwGate -// +/** + * @file d_a_obj_lv6SwGate.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C73FBC */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct fOpAcm_HIO_entry_c { - /* 80C73F60 */ ~fOpAcm_HIO_entry_c(); -}; - -struct daLv6SwGate_c { - /* 80C74004 */ void setBaseMtx(); - /* 80C74158 */ void CreateHeap(); - /* 80C7429C */ void create(); - /* 80C74720 */ void isSwitch(); - /* 80C7476C */ void Execute(f32 (**)[3][4]); - /* 80C74A3C */ void moveGate(); - /* 80C74B48 */ void init_modeWait(); - /* 80C74B54 */ void modeWait(); - /* 80C74B58 */ void init_modeOpen(); - /* 80C74B64 */ void modeOpen(); - /* 80C74C7C */ void init_modeClose(); - /* 80C74C94 */ void modeClose(); - /* 80C74DBC */ void init_modeBreak(); - /* 80C74E40 */ void modeBreak(); - /* 80C7524C */ void Draw(); - /* 80C752F8 */ void Delete(); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; -}; - -struct daLv6SwGate_HIO_c { - /* 80C73F0C */ daLv6SwGate_HIO_c(); - /* 80C75434 */ ~daLv6SwGate_HIO_c(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80C746C4 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 80084548 */ void GetTgHitGObj(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); - /* 80C744E4 */ ~dCcD_Cyl(); - /* 80C745B0 */ dCcD_Cyl(); -}; - -struct dBgW_Base {}; -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80C74634 */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80C7467C */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80C753EC */ ~cCcD_GStts(); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -283,10 +101,6 @@ extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); extern "C" void __construct_array(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_22(); @@ -295,8 +109,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_22(); extern "C" void _restgpr_25(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -304,8 +116,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -416,25 +226,30 @@ SECTION_DATA static u8 mode_proc[48] = { #pragma pop /* 80C75674-80C75694 -00001 0020+00 1/0 0/0 0/0 .data l_daLv6SwGate_Method */ -SECTION_DATA static void* l_daLv6SwGate_Method[8] = { - (void*)daLv6SwGate_Create__FP10fopAc_ac_c, - (void*)daLv6SwGate_Delete__FP13daLv6SwGate_c, - (void*)daLv6SwGate_Execute__FP13daLv6SwGate_c, - (void*)NULL, - (void*)daLv6SwGate_Draw__FP13daLv6SwGate_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daLv6SwGate_Method = { + (process_method_func)daLv6SwGate_Create__FP10fopAc_ac_c, + (process_method_func)daLv6SwGate_Delete__FP13daLv6SwGate_c, + (process_method_func)daLv6SwGate_Execute__FP13daLv6SwGate_c, + 0, + (process_method_func)daLv6SwGate_Draw__FP13daLv6SwGate_c, }; /* 80C75694-80C756C4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv6SwGate */ -SECTION_DATA extern void* g_profile_Obj_Lv6SwGate[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00960000, (void*)&g_fpcLf_Method, - (void*)0x000014F8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02700000, (void*)&l_daLv6SwGate_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv6SwGate = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv6SwGate, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daLv6SwGate_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 624, // mPriority + &l_daLv6SwGate_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C756C4-80C756D0 00012C 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -514,7 +329,8 @@ asm daLv6SwGate_HIO_c::daLv6SwGate_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { +// asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { +extern "C" asm void __dt__18fOpAcm_HIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate/__dt__18fOpAcm_HIO_entry_cFv.s" } @@ -524,7 +340,8 @@ asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate/__dt__14mDoHIO_entry_cFv.s" } @@ -600,7 +417,8 @@ asm void daLv6SwGate_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Cyl::~dCcD_Cyl() { +// asm dCcD_Cyl::~dCcD_Cyl() { +extern "C" asm void __dt__8dCcD_CylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate/__dt__8dCcD_CylFv.s" } @@ -610,7 +428,8 @@ asm dCcD_Cyl::~dCcD_Cyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Cyl::dCcD_Cyl() { +// asm dCcD_Cyl::dCcD_Cyl() { +extern "C" asm void __ct__8dCcD_CylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate/__ct__8dCcD_CylFv.s" } @@ -620,7 +439,8 @@ asm dCcD_Cyl::dCcD_Cyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate/__dt__8cM3dGCylFv.s" } @@ -630,7 +450,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate/__dt__8cM3dGAabFv.s" } @@ -640,7 +461,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate/__dt__10dCcD_GSttsFv.s" } @@ -878,7 +700,8 @@ static asm void daLv6SwGate_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_lv6SzGate/d_a_obj_lv6SzGate.cpp b/rel/d/a/obj/d_a_obj_lv6SzGate/d_a_obj_lv6SzGate.cpp index 5c9bb21e818..888743f8cc8 100644 --- a/rel/d/a/obj/d_a_obj_lv6SzGate/d_a_obj_lv6SzGate.cpp +++ b/rel/d/a/obj/d_a_obj_lv6SzGate/d_a_obj_lv6SzGate.cpp @@ -1,162 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv6SzGate -// +/** + * @file d_a_obj_lv6SzGate.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv6SzGate/d_a_obj_lv6SzGate.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C758B8 */ ~mDoHIO_entry_c(); -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c {}; - -struct daLv6SzGate_c { - /* 80C75900 */ void setBaseMtx(); - /* 80C75A54 */ void CreateHeap(); - /* 80C75C0C */ void create(); - /* 80C75E18 */ void Execute(f32 (**)[3][4]); - /* 80C75E78 */ void moveGate(); - /* 80C75F64 */ void init_modeWait(); - /* 80C75F70 */ void modeWait(); - /* 80C75FC0 */ void init_modeOpenWait0(); - /* 80C75FD8 */ void modeOpenWait0(); - /* 80C76010 */ void init_modeOpenWait(); - /* 80C76094 */ void modeOpenWait(); - /* 80C760F0 */ void init_modeOpen(); - /* 80C760FC */ void modeOpen(); - /* 80C7624C */ void modeClose(); - /* 80C76328 */ void init_modeEnd(); - /* 80C76344 */ void modeEnd(); - /* 80C7637C */ void Draw(); - /* 80C76490 */ void Delete(); -}; - -struct daLv6SzGate_HIO_c { - /* 80C7586C */ daLv6SzGate_HIO_c(); - /* 80C76584 */ ~daLv6SzGate_HIO_c(); -}; - -struct cXyz {}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80C75DD0 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -236,17 +86,11 @@ extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -377,25 +221,30 @@ SECTION_DATA static u8 mode_proc[72] = { #pragma pop /* 80C76730-80C76750 -00001 0020+00 1/0 0/0 0/0 .data l_daLv6SzGate_Method */ -SECTION_DATA static void* l_daLv6SzGate_Method[8] = { - (void*)daLv6SzGate_Create__FP10fopAc_ac_c, - (void*)daLv6SzGate_Delete__FP13daLv6SzGate_c, - (void*)daLv6SzGate_Execute__FP13daLv6SzGate_c, - (void*)NULL, - (void*)daLv6SzGate_Draw__FP13daLv6SzGate_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daLv6SzGate_Method = { + (process_method_func)daLv6SzGate_Create__FP10fopAc_ac_c, + (process_method_func)daLv6SzGate_Delete__FP13daLv6SzGate_c, + (process_method_func)daLv6SzGate_Execute__FP13daLv6SzGate_c, + 0, + (process_method_func)daLv6SzGate_Draw__FP13daLv6SzGate_c, }; /* 80C76750-80C76780 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv6SzGate */ -SECTION_DATA extern void* g_profile_Obj_Lv6SzGate[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x009A0000, (void*)&g_fpcLf_Method, - (void*)0x0000061C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02740000, (void*)&l_daLv6SzGate_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv6SzGate = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv6SzGate, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daLv6SzGate_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 628, // mPriority + &l_daLv6SzGate_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C76780-80C7678C 000118 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ @@ -447,7 +296,8 @@ asm daLv6SzGate_HIO_c::daLv6SzGate_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6SzGate/d_a_obj_lv6SzGate/__dt__14mDoHIO_entry_cFv.s" } @@ -519,7 +369,8 @@ asm void daLv6SzGate_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6SzGate/d_a_obj_lv6SzGate/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_lv6Tenbin/d_a_obj_lv6Tenbin.cpp b/rel/d/a/obj/d_a_obj_lv6Tenbin/d_a_obj_lv6Tenbin.cpp index 47d4651da91..925af85f1f9 100644 --- a/rel/d/a/obj/d_a_obj_lv6Tenbin/d_a_obj_lv6Tenbin.cpp +++ b/rel/d/a/obj/d_a_obj_lv6Tenbin/d_a_obj_lv6Tenbin.cpp @@ -1,127 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv6Tenbin -// +/** + * @file d_a_obj_lv6Tenbin.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv6Tenbin/d_a_obj_lv6Tenbin.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C76988 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct daTenbin_c { - /* 80C769D0 */ void setBaseMtx(); - /* 80C76BCC */ void CreateHeap(); - /* 80C76D10 */ void create(); - /* 80C76EE0 */ void rideCallBackRight(dBgW*, fopAc_ac_c*, fopAc_ac_c*); - /* 80C77078 */ void rideCallBackLeft(dBgW*, fopAc_ac_c*, fopAc_ac_c*); - /* 80C77200 */ void Execute(f32 (**)[3][4]); - /* 80C772BC */ void procMain(); - /* 80C77464 */ void init_modeWait(); - /* 80C77470 */ void modeWait(); - /* 80C77668 */ void balanceCheck(); - /* 80C7772C */ void Draw(); - /* 80C77810 */ void Delete(); -}; - -struct daTenbin_HIO_c { - /* 80C768EC */ daTenbin_HIO_c(); - /* 80C77904 */ ~daTenbin_HIO_c(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW_Base {}; -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -188,17 +73,11 @@ extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -317,25 +196,30 @@ SECTION_DATA static u8 mode_proc[12] = { }; /* 80C77A38-80C77A58 -00001 0020+00 1/0 0/0 0/0 .data l_daTenbin_Method */ -SECTION_DATA static void* l_daTenbin_Method[8] = { - (void*)daTenbin_Create__FP10fopAc_ac_c, - (void*)daTenbin_Delete__FP10daTenbin_c, - (void*)daTenbin_Execute__FP10daTenbin_c, - (void*)NULL, - (void*)daTenbin_Draw__FP10daTenbin_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daTenbin_Method = { + (process_method_func)daTenbin_Create__FP10fopAc_ac_c, + (process_method_func)daTenbin_Delete__FP10daTenbin_c, + (process_method_func)daTenbin_Execute__FP10daTenbin_c, + 0, + (process_method_func)daTenbin_Draw__FP10daTenbin_c, }; /* 80C77A58-80C77A88 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv6Tenbin */ -SECTION_DATA extern void* g_profile_Obj_Lv6Tenbin[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00950000, (void*)&g_fpcLf_Method, - (void*)0x00000654, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x026F0000, (void*)&l_daTenbin_Method, - (void*)0x00060100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv6Tenbin = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv6Tenbin, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daTenbin_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 623, // mPriority + &l_daTenbin_Method, // sub_method + 0x00060100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C77A88-80C77AB0 000080 0028+00 1/1 0/0 0/0 .data __vt__10daTenbin_c */ @@ -380,7 +264,8 @@ asm daTenbin_HIO_c::daTenbin_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6Tenbin/d_a_obj_lv6Tenbin/__dt__14mDoHIO_entry_cFv.s" } diff --git a/rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll.cpp b/rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll.cpp index b7a9ed40b48..43fb230fe90 100644 --- a/rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll.cpp +++ b/rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll.cpp @@ -1,206 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv6TogeRoll -// +/** + * @file d_a_obj_lv6TogeRoll.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C77C80 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct daTogeRoll_c { - /* 80C77CC8 */ void setBaseMtx(); - /* 80C77D50 */ void CreateHeap(); - /* 80C77DBC */ void create(); - /* 80C78294 */ void Execute(f32 (**)[3][4]); - /* 80C78638 */ void moveTogeRoll(); - /* 80C78A8C */ void init_modeBound(); - /* 80C78B7C */ void modeBound(); - /* 80C78BD8 */ void modeBound2(); - /* 80C78C34 */ void init_modeBoundWait(); - /* 80C78C50 */ void modeBoundWait(); - /* 80C78CA8 */ void init_modeAcc(); - /* 80C78CB4 */ void modeAcc(); - /* 80C78DA0 */ void init_modeMove(); - /* 80C78DAC */ void modeMove(); - /* 80C790C4 */ void init_modeBrk(); - /* 80C790D0 */ void modeBrk(); - /* 80C792CC */ void init_modeWaitInit(); - /* 80C792E4 */ void modeWaitInit(); - /* 80C79318 */ void init_modeWait(); - /* 80C79324 */ void modeWait(); - /* 80C79344 */ void init_modeBreak(); - /* 80C793C8 */ void modeBreak(); - /* 80C795E8 */ void setNextPoint(); - /* 80C79714 */ void Draw(); - /* 80C797B8 */ void Delete(); - - static u8 const mCcDObjInfo[48]; - static u8 const mCcDObjInfo2[48]; - static u8 const mSpeed[64]; - static u8 mCcDSph[64]; - static u8 mCcDCps[76]; -}; - -struct daTogeRoll_HIO_c { - /* 80C77C2C */ daTogeRoll_HIO_c(); - /* 80C798D0 */ ~daTogeRoll_HIO_c(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct Vec {}; - -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266F48 */ void normalizeZP(); - /* 8026702C */ bool operator==(Vec const&) const; -}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcSph {}; - -struct dCcD_SrcCps {}; - -struct dCcD_Sph { - /* 80084A34 */ void Set(dCcD_SrcSph const&); - /* 80C780A0 */ ~dCcD_Sph(); - /* 80C7816C */ dCcD_Sph(); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); - /* 80C78238 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 800844F8 */ void GetTgHitObj(); - /* 80084548 */ void GetTgHitGObj(); - /* 8008457C */ void GetTgHitObjSe(); - /* 800845B0 */ void getHitSeID(u8, int); - /* 80084658 */ void ChkCoHit(); - /* 800846F0 */ void GetCoHitObj(); -}; - -struct dCcD_Cps { - /* 800847D0 */ void Set(dCcD_SrcCps const&); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cM3dGSph { - /* 8026F648 */ void SetC(cXyz const&); - /* 8026F708 */ void SetR(f32); - /* 80C781F0 */ ~cM3dGSph(); -}; - -struct cM3dGCpsS {}; - -struct cM3dGCps { - /* 8026EF88 */ cM3dGCps(); - /* 8026F03C */ void Set(cM3dGCpsS const&); -}; - -struct cM3dGAab { - /* 80C78058 */ ~cM3dGAab(); -}; - -struct cCcD_Obj { - /* 80263A48 */ void GetAc(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; -struct cCcD_GStts { - /* 80C79888 */ ~cCcD_GStts(); -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDFF8 */ void deleteObject(); - /* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -313,12 +119,6 @@ extern "C" void deleteObject__14Z2SoundObjBaseFv(); extern "C" void startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase(); extern "C" void __ct__16Z2SoundObjSimpleFv(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); -extern "C" void PSVECSquareMag(); -extern "C" void PSVECDotProduct(); extern "C" void __construct_array(); extern "C" void __ptmf_scall(); extern "C" void __cvt_fp2unsigned(); @@ -332,8 +132,6 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__8dCcD_Cps[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -343,9 +141,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -509,25 +304,30 @@ SECTION_DATA static u8 mode_proc[108] = { #pragma pop /* 80C79C70-80C79C90 -00001 0020+00 1/0 0/0 0/0 .data l_daTogeRoll_Method */ -SECTION_DATA static void* l_daTogeRoll_Method[8] = { - (void*)daTogeRoll_Create__FP10fopAc_ac_c, - (void*)daTogeRoll_Delete__FP12daTogeRoll_c, - (void*)daTogeRoll_Execute__FP12daTogeRoll_c, - (void*)NULL, - (void*)daTogeRoll_Draw__FP12daTogeRoll_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daTogeRoll_Method = { + (process_method_func)daTogeRoll_Create__FP10fopAc_ac_c, + (process_method_func)daTogeRoll_Delete__FP12daTogeRoll_c, + (process_method_func)daTogeRoll_Execute__FP12daTogeRoll_c, + 0, + (process_method_func)daTogeRoll_Draw__FP12daTogeRoll_c, }; /* 80C79C90-80C79CC0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv6TogeRoll */ -SECTION_DATA extern void* g_profile_Obj_Lv6TogeRoll[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00930000, (void*)&g_fpcLf_Method, - (void*)0x0000117C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x026D0000, (void*)&l_daTogeRoll_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv6TogeRoll = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv6TogeRoll, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daTogeRoll_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 621, // mPriority + &l_daTogeRoll_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C79CC0-80C79CCC 0001D4 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -600,7 +400,8 @@ asm daTogeRoll_HIO_c::daTogeRoll_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll/__dt__14mDoHIO_entry_cFv.s" } @@ -673,7 +474,8 @@ asm void daTogeRoll_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll/__dt__8cM3dGAabFv.s" } @@ -683,7 +485,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Sph::~dCcD_Sph() { +// asm dCcD_Sph::~dCcD_Sph() { +extern "C" asm void __dt__8dCcD_SphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll/__dt__8dCcD_SphFv.s" } @@ -693,7 +496,8 @@ asm dCcD_Sph::~dCcD_Sph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Sph::dCcD_Sph() { +// asm dCcD_Sph::dCcD_Sph() { +extern "C" asm void __ct__8dCcD_SphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll/__ct__8dCcD_SphFv.s" } @@ -703,7 +507,8 @@ asm dCcD_Sph::dCcD_Sph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { +// asm cM3dGSph::~cM3dGSph() { +extern "C" asm void __dt__8cM3dGSphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll/__dt__8cM3dGSphFv.s" } @@ -713,7 +518,8 @@ asm cM3dGSph::~cM3dGSph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll/__dt__10dCcD_GSttsFv.s" } @@ -1126,7 +932,8 @@ static asm void daTogeRoll_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap.cpp b/rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap.cpp index 909dc01012a..75281ab45a3 100644 --- a/rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap.cpp +++ b/rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap.cpp @@ -1,227 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv6TogeTrap -// +/** + * @file d_a_obj_lv6TogeTrap.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C79EC8 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct daLv6TogeTrap_c { - /* 80C79F10 */ void setBaseMtx(); - /* 80C79FE8 */ void CreateHeap(); - /* 80C7A068 */ void create(); - /* 80C7A6B0 */ void searchSekizoAct(void*, void*); - /* 80C7A700 */ void Execute(f32 (**)[3][4]); - /* 80C7A97C */ void moveLift(); - /* 80C7ABC8 */ void executeType1(); - /* 80C7ACA0 */ void init_modeBound(); - /* 80C7AD40 */ void modeBound(); - /* 80C7ADA4 */ void init_modeBoundWait(); - /* 80C7ADC0 */ void modeBoundWait(); - /* 80C7AE18 */ void init_modeAcc(); - /* 80C7AE24 */ void modeAcc(); - /* 80C7AF10 */ void init_modeMove(); - /* 80C7AF1C */ void modeMove(); - /* 80C7B234 */ void init_modeBrk(); - /* 80C7B240 */ void modeBrk(); - /* 80C7B43C */ void init_modeMove2(); - /* 80C7B448 */ void modeMove2(); - /* 80C7B518 */ void init_modeWaitInit(); - /* 80C7B530 */ void modeWaitInit(); - /* 80C7B600 */ void init_modeWait(); - /* 80C7B60C */ void modeWait(); - /* 80C7B6D4 */ void executeType2(); - /* 80C7B988 */ void init_modeWaitType2(); - /* 80C7B9A8 */ void modeWaitType2(); - /* 80C7BA38 */ void init_modeMoveInitType2(); - /* 80C7BA50 */ void modeMoveInitType2(); - /* 80C7BAE8 */ void init_modeAccType2(); - /* 80C7BAF4 */ void modeAccType2(); - /* 80C7BC54 */ void init_modeWaitAttackType2(); - /* 80C7BC7C */ void modeWaitAttackType2(); - /* 80C7BD64 */ void init_modeRotate(); - /* 80C7BD70 */ void modeRotate(); - /* 80C7BED8 */ void init_modeBreak(); - /* 80C7BFE4 */ void modeBreak(); - /* 80C7C1D8 */ void setNextPoint(); - /* 80C7C33C */ void Draw(); - /* 80C7C3E0 */ void Delete(); - - static u8 const mCcDObjInfo[48]; - static u8 const mCcDObjInfo2[48]; - static u8 const mSpeed[64]; - static u8 mCcDSph[64]; - static u8 mCcDCyl[68]; -}; - -struct daLv6TogeTrap_HIO_c { - /* 80C79E4C */ daLv6TogeTrap_HIO_c(); - /* 80C7C504 */ ~daLv6TogeTrap_HIO_c(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct Vec {}; - -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; - /* 80266B34 */ void operator-(Vec const&) const; - /* 8026702C */ bool operator==(Vec const&) const; -}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; -struct dCcD_SrcSph {}; - -struct dCcD_SrcCyl {}; - -struct dCcD_Sph { - /* 80084A34 */ void Set(dCcD_SrcSph const&); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); - /* 80C7A60C */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 800844F8 */ void GetTgHitObj(); - /* 80084548 */ void GetTgHitGObj(); - /* 8008457C */ void GetTgHitObjSe(); - /* 800845B0 */ void getHitSeID(u8, int); - /* 80084658 */ void ChkCoHit(); -}; - -struct dCcD_GAtTgCoCommonBase { - /* 80083688 */ void GetAc(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cM3dGSph { - /* 8026F648 */ void SetC(cXyz const&); - /* 8026F708 */ void SetR(f32); - /* 80C7A57C */ ~cM3dGSph(); -}; - -struct cM3dGLin { - /* 8026F2E8 */ void SetStartEnd(cXyz const&, cXyz const&); - /* 80C7A668 */ ~cM3dGLin(); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80C7A534 */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80C7A5C4 */ ~cM3dGAab(); -}; - -struct cCcD_Obj { - /* 80263A48 */ void GetAc(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80C7C4BC */ ~cCcD_GStts(); -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDFF8 */ void deleteObject(); - /* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -353,12 +139,6 @@ extern "C" void deleteObject__14Z2SoundObjBaseFv(); extern "C" void startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase(); extern "C" void __ct__16Z2SoundObjSimpleFv(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); -extern "C" void PSVECSquareMag(); -extern "C" void PSVECDotProduct(); extern "C" void __ptmf_scall(); extern "C" void __cvt_fp2unsigned(); extern "C" void _savegpr_26(); @@ -367,8 +147,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -378,9 +156,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -634,25 +409,30 @@ SECTION_DATA static u8 mode_proc[168] = { #pragma pop /* 80C7C978-80C7C998 -00001 0020+00 1/0 0/0 0/0 .data l_daLv6TogeTrap_Method */ -SECTION_DATA static void* l_daLv6TogeTrap_Method[8] = { - (void*)daLv6TogeTrap_Create__FP10fopAc_ac_c, - (void*)daLv6TogeTrap_Delete__FP15daLv6TogeTrap_c, - (void*)daLv6TogeTrap_Execute__FP15daLv6TogeTrap_c, - (void*)NULL, - (void*)daLv6TogeTrap_Draw__FP15daLv6TogeTrap_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daLv6TogeTrap_Method = { + (process_method_func)daLv6TogeTrap_Create__FP10fopAc_ac_c, + (process_method_func)daLv6TogeTrap_Delete__FP15daLv6TogeTrap_c, + (process_method_func)daLv6TogeTrap_Execute__FP15daLv6TogeTrap_c, + 0, + (process_method_func)daLv6TogeTrap_Draw__FP15daLv6TogeTrap_c, }; /* 80C7C998-80C7C9C8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv6TogeTrap */ -SECTION_DATA extern void* g_profile_Obj_Lv6TogeTrap[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00940000, (void*)&g_fpcLf_Method, - (void*)0x000008F4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x026E0000, (void*)&l_daLv6TogeTrap_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv6TogeTrap = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv6TogeTrap, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daLv6TogeTrap_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 622, // mPriority + &l_daLv6TogeTrap_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C7C9C8-80C7C9D4 000250 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -739,7 +519,8 @@ asm daLv6TogeTrap_HIO_c::daLv6TogeTrap_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap/__dt__14mDoHIO_entry_cFv.s" } @@ -886,7 +667,8 @@ asm void daLv6TogeTrap_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap/__dt__8cM3dGCylFv.s" } @@ -896,7 +678,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { +// asm cM3dGSph::~cM3dGSph() { +extern "C" asm void __dt__8cM3dGSphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap/__dt__8cM3dGSphFv.s" } @@ -906,7 +689,8 @@ asm cM3dGSph::~cM3dGSph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap/__dt__8cM3dGAabFv.s" } @@ -916,7 +700,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap/__dt__10dCcD_GSttsFv.s" } @@ -926,7 +711,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGLin::~cM3dGLin() { +// asm cM3dGLin::~cM3dGLin() { +extern "C" asm void __dt__8cM3dGLinFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap/__dt__8cM3dGLinFv.s" } @@ -1479,7 +1265,8 @@ static asm void daLv6TogeTrap_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.cpp b/rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.cpp index d73be663c34..e5d7f37b1f6 100644 --- a/rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.cpp +++ b/rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.cpp @@ -1,155 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv6bemos -// +/** + * @file d_a_obj_lv6bemos.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CCC8 */ void push(); - /* 8000CD14 */ void pop(); - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct J3DAnmTextureSRTKey {}; - -struct J3DMaterialTable { - /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); -}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c {}; - -struct daObjL6Bm_c { - /* 80C7CE24 */ void initBaseMtx(); - /* 80C7CE60 */ void setBaseMtx(); - /* 80C7CED4 */ void Create(); - /* 80C7CFD0 */ void CreateHeap(); - /* 80C7D2F8 */ void create1st(); - /* 80C7D3A4 */ void Execute(f32 (**)[3][4]); - /* 80C7D4F4 */ void action(); - /* 80C7D598 */ void actionWait(); - /* 80C7D6CC */ void actionFindPlayer(); - /* 80C7D894 */ void actionAttack(); - /* 80C7D898 */ void Draw(); - /* 80C7DABC */ void Delete(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct _GXTexObj {}; - -struct dDlst_shadowControl_c { - /* 80055F84 */ void setSimple(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*); - - static u8 mSimpleTexObj[32]; -}; - -struct dBgW {}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjGndChk { - /* 80C7DC78 */ ~dBgS_ObjGndChk(); -}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS { - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct J3DSys { - static u8 mCurrentMtx[48]; -}; - -struct J3DModel {}; - -struct J3DJoint {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80C7D2B0 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -247,9 +104,6 @@ extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); extern "C" void removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_25(); extern "C" void _savegpr_27(); @@ -259,8 +113,6 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__8dCcD_Cps[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -271,8 +123,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" extern u8 data_80C7E138[4]; @@ -500,25 +350,30 @@ SECTION_DATA static u8 l_func[36] = { #pragma pop /* 80C7E048-80C7E068 -00001 0020+00 1/0 0/0 0/0 .data daObjL6Bm_METHODS */ -SECTION_DATA static void* daObjL6Bm_METHODS[8] = { - (void*)daObjL6Bm_create1st__FP11daObjL6Bm_c, - (void*)daObjL6Bm_MoveBGDelete__FP11daObjL6Bm_c, - (void*)daObjL6Bm_MoveBGExecute__FP11daObjL6Bm_c, - (void*)NULL, - (void*)daObjL6Bm_MoveBGDraw__FP11daObjL6Bm_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjL6Bm_METHODS = { + (process_method_func)daObjL6Bm_create1st__FP11daObjL6Bm_c, + (process_method_func)daObjL6Bm_MoveBGDelete__FP11daObjL6Bm_c, + (process_method_func)daObjL6Bm_MoveBGExecute__FP11daObjL6Bm_c, + 0, + (process_method_func)daObjL6Bm_MoveBGDraw__FP11daObjL6Bm_c, }; /* 80C7E068-80C7E098 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv6bemos */ -SECTION_DATA extern void* g_profile_Obj_Lv6bemos[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x008D0000, (void*)&g_fpcLf_Method, - (void*)0x00000918, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02760000, (void*)&daObjL6Bm_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv6bemos = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv6bemos, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjL6Bm_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 630, // mPriority + &daObjL6Bm_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C7E098-80C7E0A4 000120 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -593,7 +448,8 @@ asm void daObjL6Bm_c::CreateHeap() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos/__dt__12J3DFrameCtrlFv.s" } @@ -765,7 +621,8 @@ static asm void daObjL6Bm_create1st(daObjL6Bm_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +// asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +extern "C" asm void __dt__14dBgS_ObjGndChkFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos/__dt__14dBgS_ObjGndChkFv.s" } diff --git a/rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.cpp b/rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.cpp index 6cf2bdc9cb1..eda740ffbe4 100644 --- a/rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.cpp +++ b/rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.cpp @@ -1,180 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv6bemos2 -// +/** + * @file d_a_obj_lv6bemos2.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" +#include "d/d_camera.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CDD4 */ void transM(cXyz const&); - /* 8000CE38 */ void scaleM(f32, f32, f32); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c {}; - -struct fopAcM_lc_c { - /* 8001DC68 */ void lineCheck(cXyz const*, cXyz const*, fopAc_ac_c const*); - - static u8 mLineCheck[112]; -}; - -struct daObjLv6Bm_c { - /* 80C7E30C */ void initBaseMtx(); - /* 80C7E374 */ void setBaseMtx(); - /* 80C7E448 */ void Create(); - /* 80C7E764 */ void CreateHeap(); - /* 80C7EB7C */ void create1st(); - /* 80C7EC6C */ void Execute(f32 (**)[3][4]); - /* 80C7EE50 */ void action(); - /* 80C7F2A4 */ void calcBeam(); - /* 80C7F904 */ void checkFindPlayer(); - /* 80C7FA54 */ void checkSearchPlayer(); - /* 80C7FBA4 */ void getSearchDistance(); - /* 80C7FBFC */ void getBeamSearchDistance(); - /* 80C7FC54 */ void effect_proc(); - /* 80C7FD8C */ void effectWait(); - /* 80C7FD90 */ void initEffectSet0(); - /* 80C7FEC4 */ void effectSet0(); - /* 80C7FF78 */ void initActionSwWait(); - /* 80C7FFB8 */ void actionSwWait(); - /* 80C802AC */ void initActionWarning(); - /* 80C802C0 */ void actionWarning(); - /* 80C803D8 */ void initActionFindPlayer(); - /* 80C80538 */ void actionFindPlayer(); - /* 80C80684 */ void initActionAttack(); - /* 80C8082C */ void actionAttack(); - /* 80C80F48 */ void initActionDead(); - /* 80C81154 */ void actionDead(); - /* 80C81428 */ void initActionEnd(); - /* 80C814FC */ void actionEnd(); - /* 80C81500 */ void Draw(); - /* 80C816A8 */ void Delete(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dCamera_c { - /* 80181534 */ void ForceLockOn(fopAc_ac_c*); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS { - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDFF8 */ void deleteObject(); -}; - -struct JUTNameTab { - /* 802DEAF8 */ void getName(u16) const; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; - -struct J3DJoint {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80C7EB34 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -312,9 +145,6 @@ extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void getName__10JUTNameTabCFUs(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_23(); extern "C" void _savegpr_24(); @@ -330,8 +160,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__8dCcD_Cps[36]; @@ -344,8 +172,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" u8 mLineCheck__11fopAcM_lc_c[112]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 struct_80C81FE8[4]; @@ -680,25 +506,30 @@ SECTION_DATA static void* lit_5281[7] = { }; /* 80C81F18-80C81F38 -00001 0020+00 1/0 0/0 0/0 .data daObjLv6Bm_METHODS */ -SECTION_DATA static void* daObjLv6Bm_METHODS[8] = { - (void*)daObjLv6Bm_create1st__FP12daObjLv6Bm_c, - (void*)daObjLv6Bm_MoveBGDelete__FP12daObjLv6Bm_c, - (void*)daObjLv6Bm_MoveBGExecute__FP12daObjLv6Bm_c, - (void*)NULL, - (void*)daObjLv6Bm_MoveBGDraw__FP12daObjLv6Bm_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjLv6Bm_METHODS = { + (process_method_func)daObjLv6Bm_create1st__FP12daObjLv6Bm_c, + (process_method_func)daObjLv6Bm_MoveBGDelete__FP12daObjLv6Bm_c, + (process_method_func)daObjLv6Bm_MoveBGExecute__FP12daObjLv6Bm_c, + 0, + (process_method_func)daObjLv6Bm_MoveBGDraw__FP12daObjLv6Bm_c, }; /* 80C81F38-80C81F68 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv6bemos2 */ -SECTION_DATA extern void* g_profile_Obj_Lv6bemos2[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x008E0000, (void*)&g_fpcLf_Method, - (void*)0x00000ABC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02770000, (void*)&daObjLv6Bm_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv6bemos2 = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv6bemos2, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjLv6Bm_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 631, // mPriority + &daObjLv6Bm_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C81F68-80C81F74 000264 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -764,7 +595,8 @@ asm void daObjLv6Bm_c::CreateHeap() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_lv6egate/d_a_obj_lv6egate.cpp b/rel/d/a/obj/d_a_obj_lv6egate/d_a_obj_lv6egate.cpp index 12bccf3052b..7818ba7767a 100644 --- a/rel/d/a/obj/d_a_obj_lv6egate/d_a_obj_lv6egate.cpp +++ b/rel/d/a/obj/d_a_obj_lv6egate/d_a_obj_lv6egate.cpp @@ -1,91 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv6egate -// +/** + * @file d_a_obj_lv6egate.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv6egate/d_a_obj_lv6egate.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjLv6EGate_c { - /* 80C82078 */ void create1st(); - /* 80C82108 */ void setMtx(); - /* 80C82178 */ bool CreateHeap(); - /* 80C82180 */ void Create(); - /* 80C822DC */ void offDisp(); - /* 80C82330 */ void onDisp(); - /* 80C82388 */ void Execute(f32 (**)[3][4]); - /* 80C82690 */ void Draw(); - /* 80C826A0 */ void Delete(); - /* 80C82A80 */ ~daObjLv6EGate_c(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dPa_levelEcallBack {}; - -struct dKy_tevstr_c {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dBgW_Base {}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; // // Forward References: @@ -148,15 +69,10 @@ extern "C" void SetC__8cM3dGCylFRC4cXyz(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void _savegpr_25(); extern "C" void _restgpr_25(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -346,25 +262,30 @@ asm void daObjLv6EGate_c::Delete() { /* ############################################################################################## */ /* 80C82BF8-80C82C18 -00001 0020+00 1/0 0/0 0/0 .data daObjLv6EGate_METHODS */ -SECTION_DATA static void* daObjLv6EGate_METHODS[8] = { - (void*)daObjLv6EGate_create1st__FP15daObjLv6EGate_c, - (void*)daObjLv6EGate_MoveBGDelete__FP15daObjLv6EGate_c, - (void*)daObjLv6EGate_MoveBGExecute__FP15daObjLv6EGate_c, - (void*)NULL, - (void*)daObjLv6EGate_MoveBGDraw__FP15daObjLv6EGate_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjLv6EGate_METHODS = { + (process_method_func)daObjLv6EGate_create1st__FP15daObjLv6EGate_c, + (process_method_func)daObjLv6EGate_MoveBGDelete__FP15daObjLv6EGate_c, + (process_method_func)daObjLv6EGate_MoveBGExecute__FP15daObjLv6EGate_c, + 0, + (process_method_func)daObjLv6EGate_MoveBGDraw__FP15daObjLv6EGate_c, }; /* 80C82C18-80C82C48 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv6EGate */ -SECTION_DATA extern void* g_profile_Obj_Lv6EGate[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00CD0000, (void*)&g_fpcLf_Method, - (void*)0x00001038, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x029C0000, (void*)&daObjLv6EGate_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv6EGate = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv6EGate, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjLv6EGate_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 668, // mPriority + &daObjLv6EGate_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C82C48-80C82C54 000098 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */ diff --git a/rel/d/a/obj/d_a_obj_lv6elevta/d_a_obj_lv6elevta.cpp b/rel/d/a/obj/d_a_obj_lv6elevta/d_a_obj_lv6elevta.cpp index 9c9b197e917..97ab7e5da0e 100644 --- a/rel/d/a/obj/d_a_obj_lv6elevta/d_a_obj_lv6elevta.cpp +++ b/rel/d/a/obj/d_a_obj_lv6elevta/d_a_obj_lv6elevta.cpp @@ -1,101 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv6elevta -// +/** + * @file d_a_obj_lv6elevta.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv6elevta/d_a_obj_lv6elevta.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjLv6ElevtA_c { - /* 80C82D38 */ void create1st(); - /* 80C82DC8 */ void setMtx(); - /* 80C82E38 */ void CreateHeap(); - /* 80C82EA8 */ void Create(); - /* 80C83028 */ void eventStart(); - /* 80C830BC */ void moveAngle(void*); - /* 80C8321C */ void Execute(f32 (**)[3][4]); - /* 80C83538 */ void Draw(); - /* 80C835DC */ void Delete(); - /* 80C83764 */ ~daObjLv6ElevtA_c(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dEvLib_callback_c { - /* 8004886C */ void eventUpdate(); - /* 80048940 */ void orderEvent(int, int, int); - /* 80C83704 */ ~dEvLib_callback_c(); - /* 80C8374C */ bool eventStart(); - /* 80C83754 */ bool eventRun(); - /* 80C8375C */ bool eventEnd(); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -155,17 +65,11 @@ extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // @@ -335,25 +239,30 @@ asm void daObjLv6ElevtA_c::Delete() { /* ############################################################################################## */ /* 80C83858-80C83878 -00001 0020+00 1/0 0/0 0/0 .data daObjLv6ElevtA_METHODS */ -SECTION_DATA static void* daObjLv6ElevtA_METHODS[8] = { - (void*)daObjLv6ElevtA_create1st__FP16daObjLv6ElevtA_c, - (void*)daObjLv6ElevtA_MoveBGDelete__FP16daObjLv6ElevtA_c, - (void*)daObjLv6ElevtA_MoveBGExecute__FP16daObjLv6ElevtA_c, - (void*)NULL, - (void*)daObjLv6ElevtA_MoveBGDraw__FP16daObjLv6ElevtA_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjLv6ElevtA_METHODS = { + (process_method_func)daObjLv6ElevtA_create1st__FP16daObjLv6ElevtA_c, + (process_method_func)daObjLv6ElevtA_MoveBGDelete__FP16daObjLv6ElevtA_c, + (process_method_func)daObjLv6ElevtA_MoveBGExecute__FP16daObjLv6ElevtA_c, + 0, + (process_method_func)daObjLv6ElevtA_MoveBGDraw__FP16daObjLv6ElevtA_c, }; /* 80C83878-80C838A8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv6ElevtA */ -SECTION_DATA extern void* g_profile_Obj_Lv6ElevtA[12] = { - (void*)0xFFFFFFFD, (void*)0x0002FFFD, - (void*)0x001B0000, (void*)&g_fpcLf_Method, - (void*)0x00000628, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x029D0000, (void*)&daObjLv6ElevtA_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv6ElevtA = { + fpcLy_CURRENT_e, // mLayerID + 2, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv6ElevtA, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjLv6ElevtA_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 669, // mPriority + &daObjLv6ElevtA_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C838A8-80C838C0 000054 0018+00 3/3 0/0 0/0 .data __vt__17dEvLib_callback_c */ @@ -436,7 +345,8 @@ static asm void daObjLv6ElevtA_MoveBGDraw(daObjLv6ElevtA_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dEvLib_callback_c::~dEvLib_callback_c() { +// asm dEvLib_callback_c::~dEvLib_callback_c() { +extern "C" asm void __dt__17dEvLib_callback_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6elevta/d_a_obj_lv6elevta/__dt__17dEvLib_callback_cFv.s" } @@ -444,17 +354,20 @@ asm dEvLib_callback_c::~dEvLib_callback_c() { /* 80C8374C-80C83754 000A8C 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventStart() { +// bool dEvLib_callback_c::eventStart() { +extern "C" bool eventStart__17dEvLib_callback_cFv() { return true; } /* 80C83754-80C8375C 000A94 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventRun() { +// bool dEvLib_callback_c::eventRun() { +extern "C" bool eventRun__17dEvLib_callback_cFv() { return true; } /* 80C8375C-80C83764 000A9C 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventEnd() { +// bool dEvLib_callback_c::eventEnd() { +extern "C" bool eventEnd__17dEvLib_callback_cFv() { return true; } diff --git a/rel/d/a/obj/d_a_obj_lv6swturn/d_a_obj_lv6swturn.cpp b/rel/d/a/obj/d_a_obj_lv6swturn/d_a_obj_lv6swturn.cpp index e328c3dc9c9..12f81c9ec08 100644 --- a/rel/d/a/obj/d_a_obj_lv6swturn/d_a_obj_lv6swturn.cpp +++ b/rel/d/a/obj/d_a_obj_lv6swturn/d_a_obj_lv6swturn.cpp @@ -1,111 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv6swturn -// +/** + * @file d_a_obj_lv6swturn.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv6swturn/d_a_obj_lv6swturn.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjLv6SwTurn_c { - /* 80C83A98 */ void initBaseMtx(); - /* 80C83AD4 */ void setBaseMtx(); - /* 80C83B38 */ void Create(); - /* 80C83C10 */ void CreateHeap(); - /* 80C83C80 */ void create1st(); - /* 80C83D04 */ void Execute(f32 (**)[3][4]); - /* 80C83D94 */ void mode_proc_call(); - /* 80C83E20 */ void init_modeWait(); - /* 80C83E58 */ void modeWait(); - /* 80C84238 */ void init_modeRotate(); - /* 80C8425C */ void modeRotate(); - /* 80C844F8 */ void Draw(); - /* 80C8459C */ void Delete(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 800352B0 */ void offSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW_Base { - struct PushPullLabel {}; -}; - -struct dBgW {}; -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -165,19 +66,13 @@ extern "C" void cLib_addCalcAngleS__FPsssss(); extern "C" void cLib_addCalcAngleS2__FPssss(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_27(); extern "C" void _savegpr_29(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_80C847A0[4]; @@ -446,25 +341,30 @@ asm void daObjLv6SwTurn_c::Delete() { /* ############################################################################################## */ /* 80C84724-80C84744 -00001 0020+00 1/0 0/0 0/0 .data daObjLv6SwTurn_METHODS */ -SECTION_DATA static void* daObjLv6SwTurn_METHODS[8] = { - (void*)daObjLv6SwTurn_create1st__FP16daObjLv6SwTurn_c, - (void*)daObjLv6SwTurn_MoveBGDelete__FP16daObjLv6SwTurn_c, - (void*)daObjLv6SwTurn_MoveBGExecute__FP16daObjLv6SwTurn_c, - (void*)NULL, - (void*)daObjLv6SwTurn_MoveBGDraw__FP16daObjLv6SwTurn_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjLv6SwTurn_METHODS = { + (process_method_func)daObjLv6SwTurn_create1st__FP16daObjLv6SwTurn_c, + (process_method_func)daObjLv6SwTurn_MoveBGDelete__FP16daObjLv6SwTurn_c, + (process_method_func)daObjLv6SwTurn_MoveBGExecute__FP16daObjLv6SwTurn_c, + 0, + (process_method_func)daObjLv6SwTurn_MoveBGDraw__FP16daObjLv6SwTurn_c, }; /* 80C84744-80C84774 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv6SwTurn */ -SECTION_DATA extern void* g_profile_Obj_Lv6SwTurn[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x001F0000, (void*)&g_fpcLf_Method, - (void*)0x000005CC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x000F0000, (void*)&daObjLv6SwTurn_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv6SwTurn = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv6SwTurn, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjLv6SwTurn_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 15, // mPriority + &daObjLv6SwTurn_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C84774-80C8479C 0000A4 0028+00 1/1 0/0 0/0 .data __vt__16daObjLv6SwTurn_c */ diff --git a/rel/d/a/obj/d_a_obj_lv7BsGate/d_a_obj_lv7BsGate.cpp b/rel/d/a/obj/d_a_obj_lv7BsGate/d_a_obj_lv7BsGate.cpp index 925117df4af..436be271e3e 100644 --- a/rel/d/a/obj/d_a_obj_lv7BsGate/d_a_obj_lv7BsGate.cpp +++ b/rel/d/a/obj/d_a_obj_lv7BsGate/d_a_obj_lv7BsGate.cpp @@ -1,109 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv7BsGate -// +/** + * @file d_a_obj_lv7BsGate.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv7BsGate/d_a_obj_lv7BsGate.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C848E8 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct daLv7BsGate_c { - /* 80C84930 */ void setBaseMtx(); - /* 80C849CC */ void CreateHeap(); - /* 80C84A4C */ void create(); - /* 80C84BCC */ void Execute(f32 (**)[3][4]); - /* 80C84C1C */ void moveGate(); - /* 80C84D24 */ void init_modeWait(); - /* 80C84D30 */ void modeWait(); - /* 80C84D34 */ void init_modeOpen(); - /* 80C84D40 */ void modeOpen(); - /* 80C84E94 */ void init_modeClose(); - /* 80C84EA0 */ void modeClose(); - /* 80C84FF4 */ void Draw(); - /* 80C85098 */ void Delete(); -}; - -struct daLv7BsGate_HIO_c { - /* 80C848AC */ daLv7BsGate_HIO_c(); - /* 80C85164 */ ~daLv7BsGate_HIO_c(); -}; - -struct cXyz {}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -163,17 +66,11 @@ extern "C" void cLib_addCalc__FPfffff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -272,25 +169,30 @@ SECTION_DATA static u8 mode_proc[36] = { #pragma pop /* 80C852C4-80C852E4 -00001 0020+00 1/0 0/0 0/0 .data l_daLv7BsGate_Method */ -SECTION_DATA static void* l_daLv7BsGate_Method[8] = { - (void*)daLv7BsGate_Create__FP10fopAc_ac_c, - (void*)daLv7BsGate_Delete__FP13daLv7BsGate_c, - (void*)daLv7BsGate_Execute__FP13daLv7BsGate_c, - (void*)NULL, - (void*)daLv7BsGate_Draw__FP13daLv7BsGate_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daLv7BsGate_Method = { + (process_method_func)daLv7BsGate_Create__FP10fopAc_ac_c, + (process_method_func)daLv7BsGate_Delete__FP13daLv7BsGate_c, + (process_method_func)daLv7BsGate_Execute__FP13daLv7BsGate_c, + 0, + (process_method_func)daLv7BsGate_Draw__FP13daLv7BsGate_c, }; /* 80C852E4-80C85314 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv7BsGate */ -SECTION_DATA extern void* g_profile_Obj_Lv7BsGate[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00A10000, (void*)&g_fpcLf_Method, - (void*)0x000005BC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02820000, (void*)&l_daLv7BsGate_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv7BsGate = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv7BsGate, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daLv7BsGate_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 642, // mPriority + &l_daLv7BsGate_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C85314-80C8533C 0000D0 0028+00 1/1 0/0 0/0 .data __vt__13daLv7BsGate_c */ @@ -335,7 +237,8 @@ asm daLv7BsGate_HIO_c::daLv7BsGate_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv7BsGate/d_a_obj_lv7BsGate/__dt__14mDoHIO_entry_cFv.s" } diff --git a/rel/d/a/obj/d_a_obj_lv7PropellerY/d_a_obj_lv7PropellerY.cpp b/rel/d/a/obj/d_a_obj_lv7PropellerY/d_a_obj_lv7PropellerY.cpp index 21678515f78..ff02b0191e5 100644 --- a/rel/d/a/obj/d_a_obj_lv7PropellerY/d_a_obj_lv7PropellerY.cpp +++ b/rel/d/a/obj/d_a_obj_lv7PropellerY/d_a_obj_lv7PropellerY.cpp @@ -1,106 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv7PropellerY -// +/** + * @file d_a_obj_lv7PropellerY.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv7PropellerY/d_a_obj_lv7PropellerY.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C854C4 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct daPropY_c { - /* 80C8550C */ void setBaseMtx(); - /* 80C855A4 */ void CreateHeap(); - /* 80C85624 */ void create(); - /* 80C85810 */ void Execute(f32 (**)[3][4]); - /* 80C85860 */ void procMain(); - /* 80C859B4 */ void init_modeMoveWait(); - /* 80C859C0 */ void modeMoveWait(); - /* 80C859C4 */ void init_modeMove(); - /* 80C859E0 */ void modeMove(); - /* 80C85B08 */ void init_modeWait(); - /* 80C85B24 */ void modeWait(); - /* 80C85B5C */ void init_modeMove2(); - /* 80C85B84 */ void modeMove2(); - /* 80C85CAC */ void init_modeStop(); - /* 80C85DD0 */ void modeStop(); - /* 80C85F14 */ void Draw(); - /* 80C85FB8 */ void Delete(); -}; - -struct daPropY_HIO_c { - /* 80C8546C */ daPropY_HIO_c(); - /* 80C86084 */ ~daPropY_HIO_c(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; -struct Vec {}; - -struct Z2SeMgr { - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -162,20 +68,14 @@ extern "C" void cLib_addCalcAngleS__FPsssss(); extern "C" void cLib_chaseF__FPfff(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); extern "C" void __cvt_fp2unsigned(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -324,25 +224,30 @@ SECTION_DATA static u8 mode_proc[60] = { #pragma pop /* 80C86224-80C86244 -00001 0020+00 1/0 0/0 0/0 .data l_daPropY_Method */ -SECTION_DATA static void* l_daPropY_Method[8] = { - (void*)daPropY_Create__FP10fopAc_ac_c, - (void*)daPropY_Delete__FP9daPropY_c, - (void*)daPropY_Execute__FP9daPropY_c, - (void*)NULL, - (void*)daPropY_Draw__FP9daPropY_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daPropY_Method = { + (process_method_func)daPropY_Create__FP10fopAc_ac_c, + (process_method_func)daPropY_Delete__FP9daPropY_c, + (process_method_func)daPropY_Execute__FP9daPropY_c, + 0, + (process_method_func)daPropY_Draw__FP9daPropY_c, }; /* 80C86244-80C86274 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv7PropY */ -SECTION_DATA extern void* g_profile_Obj_Lv7PropY[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00A00000, (void*)&g_fpcLf_Method, - (void*)0x000005C8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02810000, (void*)&l_daPropY_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv7PropY = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv7PropY, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daPropY_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 641, // mPriority + &l_daPropY_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C86274-80C8629C 000100 0028+00 1/1 0/0 0/0 .data __vt__9daPropY_c */ @@ -387,7 +292,8 @@ asm daPropY_HIO_c::daPropY_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv7PropellerY/d_a_obj_lv7PropellerY/__dt__14mDoHIO_entry_cFv.s" } diff --git a/rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge.cpp b/rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge.cpp index 1933c530927..2d1f00f7d27 100644 --- a/rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge.cpp +++ b/rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge.cpp @@ -1,166 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv7bridge -// +/** + * @file d_a_obj_lv7bridge.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CDD4 */ void transM(cXyz const&); - - static u8 now[48]; -}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c {}; - -struct daObjLv7Brg_c { - /* 80C863EC */ void search_swspinner(); - /* 80C86454 */ void initBaseMtx(); - /* 80C864B4 */ void setBaseMtx(); - /* 80C865B8 */ void Create(); - /* 80C867CC */ void CreateHeap(); - /* 80C86A44 */ void create1st(); - /* 80C86B40 */ void Execute(f32 (**)[3][4]); - /* 80C86E68 */ void action(); - /* 80C86F44 */ void mode_action(); - /* 80C87210 */ void mode_end(); - /* 80C87214 */ void calcCoPos(); - /* 80C87304 */ void Draw(); - /* 80C87458 */ void Delete(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); - /* 8006FB10 */ void StartQuake(int, int, cXyz); - /* 8006FD94 */ void StopQuake(int); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80C87864 */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80C877F4 */ ~dBgS_AcchCir(); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80C869FC */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -260,8 +106,6 @@ extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void __construct_array(); extern "C" void __ptmf_scall(); extern "C" void __cvt_fp2unsigned(); @@ -273,8 +117,6 @@ extern "C" void _restgpr_23(); extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -282,8 +124,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_80C87BB8[4]; @@ -507,25 +347,30 @@ SECTION_DATA static u8 mode_proc[24] = { #pragma pop /* 80C87AD0-80C87AF0 -00001 0020+00 1/0 0/0 0/0 .data daObjLv7Brg_METHODS */ -SECTION_DATA static void* daObjLv7Brg_METHODS[8] = { - (void*)daObjLv7Brg_create1st__FP13daObjLv7Brg_c, - (void*)daObjLv7Brg_MoveBGDelete__FP13daObjLv7Brg_c, - (void*)daObjLv7Brg_MoveBGExecute__FP13daObjLv7Brg_c, - (void*)NULL, - (void*)daObjLv7Brg_MoveBGDraw__FP13daObjLv7Brg_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjLv7Brg_METHODS = { + (process_method_func)daObjLv7Brg_create1st__FP13daObjLv7Brg_c, + (process_method_func)daObjLv7Brg_MoveBGDelete__FP13daObjLv7Brg_c, + (process_method_func)daObjLv7Brg_MoveBGExecute__FP13daObjLv7Brg_c, + 0, + (process_method_func)daObjLv7Brg_MoveBGDraw__FP13daObjLv7Brg_c, }; /* 80C87AF0-80C87B20 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv7Bridge */ -SECTION_DATA extern void* g_profile_Obj_Lv7Bridge[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00B50000, (void*)&g_fpcLf_Method, - (void*)0x00000AA4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02360000, (void*)&daObjLv7Brg_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv7Bridge = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv7Bridge, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjLv7Brg_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 566, // mPriority + &daObjLv7Brg_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C87B20-80C87B2C 0000EC 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ @@ -597,7 +442,8 @@ asm void daObjLv7Brg_c::CreateHeap() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge/__dt__12J3DFrameCtrlFv.s" } @@ -857,7 +703,8 @@ extern "C" asm void __dt__10dCcD_GSttsFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge/__dt__12dBgS_AcchCirFv.s" } @@ -867,7 +714,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/d_a_obj_lv8KekkaiTrap.cpp b/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/d_a_obj_lv8KekkaiTrap.cpp index e3c3a87fe95..ae3b206bc72 100644 --- a/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/d_a_obj_lv8KekkaiTrap.cpp +++ b/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/d_a_obj_lv8KekkaiTrap.cpp @@ -1,100 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv8KekkaiTrap -// +/** + * @file d_a_obj_lv8KekkaiTrap.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv8KekkaiTrap/d_a_obj_lv8KekkaiTrap.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C87CF8 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct daKekaiTrap_c { - /* 80C87D40 */ void setBaseMtx(); - /* 80C87DC8 */ void CreateHeap(); - /* 80C87E48 */ void create(); - /* 80C87FB0 */ void Execute(f32 (**)[3][4]); - /* 80C88000 */ void moveMain(); - /* 80C88104 */ void init_modeWait(); - /* 80C88110 */ void modeWait(); - /* 80C88114 */ void init_modeMoveUp(); - /* 80C88138 */ void modeMoveUp(); - /* 80C881F0 */ void init_modeMoveDown(); - /* 80C88214 */ void modeMoveDown(); - /* 80C882C8 */ void Draw(); - /* 80C8836C */ void Delete(); -}; - -struct daKekaiTrap_HIO_c { - /* 80C87CAC */ daKekaiTrap_HIO_c(); - /* 80C88438 */ ~daKekaiTrap_HIO_c(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW_Base {}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct J3DModel {}; // // Forward References: @@ -152,17 +64,11 @@ extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP extern "C" void cLib_addCalc__FPfffff(); extern "C" void cLib_chaseF__FPfff(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void __register_global_object(); // @@ -257,25 +163,30 @@ SECTION_DATA static u8 mode_proc[36] = { #pragma pop /* 80C88578-80C88598 -00001 0020+00 1/0 0/0 0/0 .data l_daKekaiTrap_Method */ -SECTION_DATA static void* l_daKekaiTrap_Method[8] = { - (void*)daKekaiTrap_Create__FP10fopAc_ac_c, - (void*)daKekaiTrap_Delete__FP13daKekaiTrap_c, - (void*)daKekaiTrap_Execute__FP13daKekaiTrap_c, - (void*)NULL, - (void*)daKekaiTrap_Draw__FP13daKekaiTrap_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daKekaiTrap_Method = { + (process_method_func)daKekaiTrap_Create__FP10fopAc_ac_c, + (process_method_func)daKekaiTrap_Delete__FP13daKekaiTrap_c, + (process_method_func)daKekaiTrap_Execute__FP13daKekaiTrap_c, + 0, + (process_method_func)daKekaiTrap_Draw__FP13daKekaiTrap_c, }; /* 80C88598-80C885C8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv8KekkaiTrap */ -SECTION_DATA extern void* g_profile_Obj_Lv8KekkaiTrap[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00A30000, (void*)&g_fpcLf_Method, - (void*)0x000005B4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02840000, (void*)&l_daKekaiTrap_Method, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv8KekkaiTrap = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv8KekkaiTrap, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daKekaiTrap_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 644, // mPriority + &l_daKekaiTrap_Method, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C885C8-80C885F0 0000C4 0028+00 1/1 0/0 0/0 .data __vt__13daKekaiTrap_c */ @@ -320,7 +231,8 @@ asm daKekaiTrap_HIO_c::daKekaiTrap_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/d_a_obj_lv8KekkaiTrap/__dt__14mDoHIO_entry_cFv.s" } diff --git a/rel/d/a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift.cpp b/rel/d/a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift.cpp index d84c14591c8..a58c1c10840 100644 --- a/rel/d/a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift.cpp +++ b/rel/d/a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift.cpp @@ -1,189 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv8Lift -// +/** + * @file d_a_obj_lv8Lift.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C88790 */ ~mDoHIO_entry_c(); -}; - -struct J3DAnmTextureSRTKey {}; - -struct J3DMaterialTable { - /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); -}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c {}; - -struct dBgW {}; - -struct daL8Lift_c { - /* 80C887D8 */ void setBaseMtx(); - /* 80C88860 */ void CreateHeap(); - /* 80C88928 */ void create(); - /* 80C88D6C */ void lightSet(); - /* 80C88DBC */ void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*); - /* 80C88DD4 */ void Execute(f32 (**)[3][4]); - /* 80C88E34 */ void moveLift(); - /* 80C890B8 */ void modeAcc(); - /* 80C89198 */ void init_modeMove(); - /* 80C891A4 */ void modeMove(); - /* 80C894BC */ void init_modeBrk(); - /* 80C894C8 */ void modeBrk(); - /* 80C896C8 */ void init_modeWaitInit(); - /* 80C896D4 */ void modeWaitInit(); - /* 80C89708 */ void init_modeWait(); - /* 80C89714 */ void modeWait(); - /* 80C89720 */ void init_modeMoveWait(); - /* 80C8972C */ void modeMoveWait(); - /* 80C89770 */ void init_modeOnAnm(); - /* 80C89820 */ void modeOnAnm(); - /* 80C89874 */ void init_modeStop(); - /* 80C898DC */ void modeStop(); - /* 80C899D0 */ void init_modeInitSet(); - /* 80C89A04 */ void modeInitSet(); - /* 80C89A24 */ void init_modeInitSet2(); - /* 80C89A58 */ void modeInitSet2(); - /* 80C89A78 */ void liftReset(); - /* 80C89ADC */ void setNextPoint(); - /* 80C89C10 */ void Draw(); - /* 80C89DC8 */ void Delete(); - - static u8 const mSpeed[64]; -}; - -struct daL8Lift_HIO_c { - /* 80C8872C */ daL8Lift_HIO_c(); - /* 80C89EA4 */ ~daL8Lift_HIO_c(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; - /* 8026702C */ bool operator==(Vec const&) const; -}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW_Base {}; -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80C88C44 */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80C88CB4 */ ~dBgS_AcchCir(); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct LIGHT_INFLUENCE {}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80C88D24 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -288,11 +111,6 @@ extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); extern "C" void removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXConcat(); -extern "C" void PSMTXTrans(); -extern "C" void C_MTXLightOrtho(); -extern "C" void PSVECSquareMag(); extern "C" void __ptmf_scall(); extern "C" void __cvt_fp2unsigned(); extern "C" void _savegpr_26(); @@ -301,13 +119,8 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -454,25 +267,30 @@ SECTION_DATA static u8 mode_proc[120] = { #pragma pop /* 80C8A114-80C8A134 -00001 0020+00 1/0 0/0 0/0 .data l_daL8Lift_Method */ -SECTION_DATA static void* l_daL8Lift_Method[8] = { - (void*)daL8Lift_Create__FP10fopAc_ac_c, - (void*)daL8Lift_Delete__FP10daL8Lift_c, - (void*)daL8Lift_Execute__FP10daL8Lift_c, - (void*)NULL, - (void*)daL8Lift_Draw__FP10daL8Lift_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daL8Lift_Method = { + (process_method_func)daL8Lift_Create__FP10fopAc_ac_c, + (process_method_func)daL8Lift_Delete__FP10daL8Lift_c, + (process_method_func)daL8Lift_Execute__FP10daL8Lift_c, + 0, + (process_method_func)daL8Lift_Draw__FP10daL8Lift_c, }; /* 80C8A134-80C8A164 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv8Lift */ -SECTION_DATA extern void* g_profile_Obj_Lv8Lift[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00A40000, (void*)&g_fpcLf_Method, - (void*)0x00000830, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02850000, (void*)&l_daL8Lift_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv8Lift = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv8Lift, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daL8Lift_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 645, // mPriority + &l_daL8Lift_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C8A164-80C8A170 000160 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ @@ -544,7 +362,8 @@ asm daL8Lift_HIO_c::daL8Lift_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift/__dt__14mDoHIO_entry_cFv.s" } @@ -651,7 +470,8 @@ asm void daL8Lift_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift/__dt__12dBgS_ObjAcchFv.s" } @@ -661,7 +481,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift/__dt__12dBgS_AcchCirFv.s" } @@ -671,7 +492,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_lv8OptiLift/d_a_obj_lv8OptiLift.cpp b/rel/d/a/obj/d_a_obj_lv8OptiLift/d_a_obj_lv8OptiLift.cpp index 7bf2cde9fa7..3791393d05c 100644 --- a/rel/d/a/obj/d_a_obj_lv8OptiLift/d_a_obj_lv8OptiLift.cpp +++ b/rel/d/a/obj/d_a_obj_lv8OptiLift/d_a_obj_lv8OptiLift.cpp @@ -1,163 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv8OptiLift -// +/** + * @file d_a_obj_lv8OptiLift.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv8OptiLift/d_a_obj_lv8OptiLift.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C8A368 */ ~mDoHIO_entry_c(); -}; - -struct J3DAnmTextureSRTKey {}; - -struct J3DMaterialTable { - /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); -}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c {}; - -struct dBgW {}; - -struct daOptiLift_c { - /* 80C8A3B0 */ void setBaseMtx(); - /* 80C8A438 */ void CreateHeap(); - /* 80C8A500 */ void create(); - /* 80C8A780 */ void lightSet(); - /* 80C8A7D0 */ void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*); - /* 80C8A7E8 */ void Execute(f32 (**)[3][4]); - /* 80C8A848 */ void moveLift(); - /* 80C8AAC4 */ void init_modeAcc(); - /* 80C8AAD0 */ void modeAcc(); - /* 80C8ABB0 */ void init_modeMove(); - /* 80C8ABBC */ void modeMove(); - /* 80C8AED4 */ void init_modeBrk(); - /* 80C8AEE0 */ void modeBrk(); - /* 80C8B100 */ void init_modeMoveInit(); - /* 80C8B1B0 */ void modeMoveInit(); - /* 80C8B1F0 */ void init_modeMoveWait(); - /* 80C8B230 */ void modeMoveWait(); - /* 80C8B288 */ void init_modeWait(); - /* 80C8B294 */ void modeWait(); - /* 80C8B298 */ void init_modeStop(); - /* 80C8B318 */ void modeStop(); - /* 80C8B428 */ void init_modeInitSet(); - /* 80C8B464 */ void modeInitSet(); - /* 80C8B484 */ void init_modeInitSet2(); - /* 80C8B4B8 */ void modeInitSet2(); - /* 80C8B4D8 */ void liftReset(); - /* 80C8B53C */ void setNextPoint(); - /* 80C8B66C */ void Draw(); - /* 80C8B824 */ void Delete(); - - static u8 const mSpeed[64]; -}; - -struct daOptiLift_HIO_c { - /* 80C8A30C */ daOptiLift_HIO_c(); - /* 80C8B900 */ ~daOptiLift_HIO_c(); -}; - -struct dSv_info_c { - /* 800352B0 */ void offSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; - /* 8026702C */ bool operator==(Vec const&) const; -}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW_Base {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct LIGHT_INFLUENCE {}; - -struct J3DModel {}; -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80C8A738 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -250,24 +99,14 @@ extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); extern "C" void removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXConcat(); -extern "C" void PSMTXTrans(); -extern "C" void C_MTXLightOrtho(); -extern "C" void PSVECSquareMag(); extern "C" void __ptmf_scall(); extern "C" void __cvt_fp2unsigned(); extern "C" void _savegpr_26(); extern "C" void _savegpr_29(); extern "C" void _restgpr_26(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -403,25 +242,30 @@ SECTION_DATA static u8 mode_proc[108] = { #pragma pop /* 80C8BB3C-80C8BB5C -00001 0020+00 1/0 0/0 0/0 .data l_daOptiLift_Method */ -SECTION_DATA static void* l_daOptiLift_Method[8] = { - (void*)daOptiLift_Create__FP10fopAc_ac_c, - (void*)daOptiLift_Delete__FP12daOptiLift_c, - (void*)daOptiLift_Execute__FP12daOptiLift_c, - (void*)NULL, - (void*)daOptiLift_Draw__FP12daOptiLift_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daOptiLift_Method = { + (process_method_func)daOptiLift_Create__FP10fopAc_ac_c, + (process_method_func)daOptiLift_Delete__FP12daOptiLift_c, + (process_method_func)daOptiLift_Execute__FP12daOptiLift_c, + 0, + (process_method_func)daOptiLift_Draw__FP12daOptiLift_c, }; /* 80C8BB5C-80C8BB8C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv8OptiLift */ -SECTION_DATA extern void* g_profile_Obj_Lv8OptiLift[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00A20000, (void*)&g_fpcLf_Method, - (void*)0x00000618, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02830000, (void*)&l_daOptiLift_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv8OptiLift = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv8OptiLift, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daOptiLift_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 643, // mPriority + &l_daOptiLift_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C8BB8C-80C8BB98 000148 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ @@ -473,7 +317,8 @@ asm daOptiLift_HIO_c::daOptiLift_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv8OptiLift/d_a_obj_lv8OptiLift/__dt__14mDoHIO_entry_cFv.s" } @@ -549,7 +394,8 @@ asm void daOptiLift_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv8OptiLift/d_a_obj_lv8OptiLift/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_lv8UdFloor/d_a_obj_lv8UdFloor.cpp b/rel/d/a/obj/d_a_obj_lv8UdFloor/d_a_obj_lv8UdFloor.cpp index aa05181460d..7d6e7d11ab8 100644 --- a/rel/d/a/obj/d_a_obj_lv8UdFloor/d_a_obj_lv8UdFloor.cpp +++ b/rel/d/a/obj/d_a_obj_lv8UdFloor/d_a_obj_lv8UdFloor.cpp @@ -1,113 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv8UdFloor -// +/** + * @file d_a_obj_lv8UdFloor.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv8UdFloor/d_a_obj_lv8UdFloor.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C8BD80 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct daUdFloor_c { - /* 80C8BDC8 */ void setBaseMtx(); - /* 80C8BE64 */ void CreateHeap(); - /* 80C8BEE4 */ void create(); - /* 80C8C0DC */ void Execute(f32 (**)[3][4]); - /* 80C8C12C */ void moveLift(); - /* 80C8C264 */ void init_modeWait(); - /* 80C8C270 */ void modeWait(); - /* 80C8C274 */ void init_modeUpMoveInit(); - /* 80C8C310 */ void modeUpMoveInit(); - /* 80C8C354 */ void colorAnm(int); - /* 80C8C5E4 */ void init_modeUpMove(); - /* 80C8C68C */ void modeUpMove(); - /* 80C8C7F8 */ void init_modeDownMoveInit(); - /* 80C8C81C */ void modeDownMoveInit(); - /* 80C8C860 */ void init_modeDownMove(); - /* 80C8C8E4 */ void modeDownMove(); - /* 80C8C994 */ void Draw(); - /* 80C8CA78 */ void Delete(); -}; - -struct daUdFloor_HIO_c { - /* 80C8BD0C */ daUdFloor_HIO_c(); - /* 80C8CB44 */ ~daUdFloor_HIO_c(); -}; - -struct cXyz {}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -172,17 +71,11 @@ extern "C" void cLib_addCalc__FPfffff(); extern "C" void cLib_chaseF__FPfff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -293,25 +186,30 @@ SECTION_DATA static u8 mode_proc[60] = { #pragma pop /* 80C8CCE4-80C8CD04 -00001 0020+00 1/0 0/0 0/0 .data l_daUdFloor_Method */ -SECTION_DATA static void* l_daUdFloor_Method[8] = { - (void*)daUdFloor_Create__FP10fopAc_ac_c, - (void*)daUdFloor_Delete__FP11daUdFloor_c, - (void*)daUdFloor_Execute__FP11daUdFloor_c, - (void*)NULL, - (void*)daUdFloor_Draw__FP11daUdFloor_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daUdFloor_Method = { + (process_method_func)daUdFloor_Create__FP10fopAc_ac_c, + (process_method_func)daUdFloor_Delete__FP11daUdFloor_c, + (process_method_func)daUdFloor_Execute__FP11daUdFloor_c, + 0, + (process_method_func)daUdFloor_Draw__FP11daUdFloor_c, }; /* 80C8CD04-80C8CD34 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv8UdFloor */ -SECTION_DATA extern void* g_profile_Obj_Lv8UdFloor[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00A50000, (void*)&g_fpcLf_Method, - (void*)0x000005C8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02860000, (void*)&l_daUdFloor_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv8UdFloor = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv8UdFloor, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daUdFloor_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 646, // mPriority + &l_daUdFloor_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C8CD34-80C8CD5C 0000F0 0028+00 1/1 0/0 0/0 .data __vt__11daUdFloor_c */ @@ -356,7 +254,8 @@ asm daUdFloor_HIO_c::daUdFloor_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv8UdFloor/d_a_obj_lv8UdFloor/__dt__14mDoHIO_entry_cFv.s" } diff --git a/rel/d/a/obj/d_a_obj_lv9SwShutter/d_a_obj_lv9SwShutter.cpp b/rel/d/a/obj/d_a_obj_lv9SwShutter/d_a_obj_lv9SwShutter.cpp index d9c7cc2381b..83189120540 100644 --- a/rel/d/a/obj/d_a_obj_lv9SwShutter/d_a_obj_lv9SwShutter.cpp +++ b/rel/d/a/obj/d_a_obj_lv9SwShutter/d_a_obj_lv9SwShutter.cpp @@ -1,105 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv9SwShutter -// +/** + * @file d_a_obj_lv9SwShutter.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_lv9SwShutter/d_a_obj_lv9SwShutter.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C8CEF0 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct daLv9SwShutter_c { - /* 80C8CF38 */ void setBaseMtx(); - /* 80C8CFD4 */ void CreateHeap(); - /* 80C8D040 */ void create(); - /* 80C8D168 */ void Execute(f32 (**)[3][4]); - /* 80C8D1B8 */ void moveShutter(); - /* 80C8D2BC */ void init_modeWait(); - /* 80C8D2C8 */ void modeWait(); - /* 80C8D2CC */ void init_modeOpen(); - /* 80C8D2D8 */ void modeOpen(); - /* 80C8D440 */ void init_modeClose(); - /* 80C8D458 */ void modeClose(); - /* 80C8D5D0 */ void Draw(); - /* 80C8D674 */ void Delete(); -}; - -struct daLv9SwShutter_HIO_c { - /* 80C8CEAC */ daLv9SwShutter_HIO_c(); - /* 80C8D730 */ ~daLv9SwShutter_HIO_c(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -160,19 +67,11 @@ extern "C" void cLib_chaseF__FPfff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -258,25 +157,30 @@ SECTION_DATA static u8 mode_proc[36] = { #pragma pop /* 80C8D874-80C8D894 -00001 0020+00 1/0 0/0 0/0 .data l_daLv9SwShutter_Method */ -SECTION_DATA static void* l_daLv9SwShutter_Method[8] = { - (void*)daLv9SwShutter_Create__FP10fopAc_ac_c, - (void*)daLv9SwShutter_Delete__FP16daLv9SwShutter_c, - (void*)daLv9SwShutter_Execute__FP16daLv9SwShutter_c, - (void*)NULL, - (void*)daLv9SwShutter_Draw__FP16daLv9SwShutter_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daLv9SwShutter_Method = { + (process_method_func)daLv9SwShutter_Create__FP10fopAc_ac_c, + (process_method_func)daLv9SwShutter_Delete__FP16daLv9SwShutter_c, + (process_method_func)daLv9SwShutter_Execute__FP16daLv9SwShutter_c, + 0, + (process_method_func)daLv9SwShutter_Draw__FP16daLv9SwShutter_c, }; /* 80C8D894-80C8D8C4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv9SwShutter */ -SECTION_DATA extern void* g_profile_Obj_Lv9SwShutter[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00A60000, (void*)&g_fpcLf_Method, - (void*)0x000005B4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02870000, (void*)&l_daLv9SwShutter_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv9SwShutter = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv9SwShutter, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daLv9SwShutter_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 647, // mPriority + &l_daLv9SwShutter_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C8D8C4-80C8D8EC 0000B8 0028+00 1/1 0/0 0/0 .data __vt__16daLv9SwShutter_c */ @@ -321,7 +225,8 @@ asm daLv9SwShutter_HIO_c::daLv9SwShutter_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv9SwShutter/d_a_obj_lv9SwShutter/__dt__14mDoHIO_entry_cFv.s" } diff --git a/rel/d/a/obj/d_a_obj_magLift/d_a_obj_magLift.cpp b/rel/d/a/obj/d_a_obj_magLift/d_a_obj_magLift.cpp index b0c389ecfe2..f60c5b2f1ef 100644 --- a/rel/d/a/obj/d_a_obj_magLift/d_a_obj_magLift.cpp +++ b/rel/d/a/obj/d_a_obj_magLift/d_a_obj_magLift.cpp @@ -1,104 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_magLift -// +/** + * @file d_a_obj_magLift.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_magLift/d_a_obj_magLift.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C8DA58 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct daMagLift_c { - /* 80C8DAA0 */ void setBaseMtx(); - /* 80C8DB28 */ void CreateHeap(); - /* 80C8DB94 */ void create(); - /* 80C8DD38 */ void Execute(f32 (**)[3][4]); - /* 80C8DD88 */ void moveLift(); - /* 80C8DE98 */ void modeAcc(); - /* 80C8DF20 */ void init_modeMove(); - /* 80C8DF2C */ void modeMove(); - /* 80C8E1EC */ void init_modeBrk(); - /* 80C8E1F8 */ void modeBrk(); - /* 80C8E260 */ void init_modeWaitInit(); - /* 80C8E26C */ void modeWaitInit(); - /* 80C8E2A0 */ void init_modeWait(); - /* 80C8E2AC */ void modeWait(); - /* 80C8E2B8 */ void init_modeMoveWait(); - /* 80C8E2C4 */ void modeMoveWait(); - /* 80C8E318 */ void modeDead(); - /* 80C8E31C */ void setNextPoint(); - /* 80C8E450 */ void Draw(); - /* 80C8E4F4 */ void Delete(); - - static u8 const mSpeed[64]; -}; - -struct daMagLift_HIO_c { - /* 80C8DA2C */ daMagLift_HIO_c(); - /* 80C8E5B0 */ ~daMagLift_HIO_c(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; - /* 8026702C */ bool operator==(Vec const&) const; -}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct J3DModel {}; // // Forward References: @@ -165,17 +73,9 @@ extern "C" bool __eq__4cXyzCFRC3Vec(); extern "C" void cLib_addCalcPos__FP4cXyzRC4cXyzfff(); extern "C" void cLib_chaseF__FPfff(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSVECSquareMag(); extern "C" void __ptmf_scall(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; extern "C" void __register_global_object(); // @@ -285,25 +185,30 @@ SECTION_DATA static u8 mode_proc[96] = { #pragma pop /* 80C8E7B0-80C8E7D0 -00001 0020+00 1/0 0/0 0/0 .data l_daMagLift_Method */ -SECTION_DATA static void* l_daMagLift_Method[8] = { - (void*)daMagLift_Create__FP10fopAc_ac_c, - (void*)daMagLift_Delete__FP11daMagLift_c, - (void*)daMagLift_Execute__FP11daMagLift_c, - (void*)NULL, - (void*)daMagLift_Draw__FP11daMagLift_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daMagLift_Method = { + (process_method_func)daMagLift_Create__FP10fopAc_ac_c, + (process_method_func)daMagLift_Delete__FP11daMagLift_c, + (process_method_func)daMagLift_Execute__FP11daMagLift_c, + 0, + (process_method_func)daMagLift_Draw__FP11daMagLift_c, }; /* 80C8E7D0-80C8E800 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_MagLift */ -SECTION_DATA extern void* g_profile_Obj_MagLift[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00370000, (void*)&g_fpcLf_Method, - (void*)0x000005D4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01EC0000, (void*)&l_daMagLift_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_MagLift = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_MagLift, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daMagLift_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 492, // mPriority + &l_daMagLift_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C8E800-80C8E828 000124 0028+00 1/1 0/0 0/0 .data __vt__11daMagLift_c */ @@ -348,7 +253,8 @@ asm daMagLift_HIO_c::daMagLift_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_magLift/d_a_obj_magLift/__dt__14mDoHIO_entry_cFv.s" } diff --git a/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.cpp b/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.cpp index 6a9f9a71e88..5de7cce86fc 100644 --- a/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.cpp +++ b/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_magLiftRot -// +/** + * @file d_a_obj_magLiftRot.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.h" #include "d/com/d_com_inf_game.h" @@ -9,77 +9,6 @@ #include "dol2asm.h" #include "m_Do/m_Do_hostIO.h" -// -// Types: -// - -class daMagLiftRot_c : public dBgS_MoveBgActor { -public: - /* 80C8EA28 */ void setBaseMtx(); - /* 80C8EC64 */ int create(); - /* 80C8F02C */ void moveLift(); - /* 80C8F264 */ void init_modeMove(); - /* 80C8F4A0 */ void modeMove(); - /* 80C8F538 */ void init_modeWait(); - /* 80C8F7CC */ void modeWait(); - /* 80C8F804 */ void init_modeMoveWait(); - /* 80C8F810 */ void modeMoveWait(); - - /* 80C8EB1C */ virtual int CreateHeap(); - /* 80C8EF94 */ virtual int Execute(Mtx**); - /* 80C8F86C */ virtual int Draw(); - /* 80C8F970 */ virtual int Delete(); - - /* 0x5A0 */ request_of_phase_process_class mPhase; - /* 0x5A8 */ J3DModel* mpModel; - /* 0x5AC */ mDoExt_btkAnm mBtk; - /* 0x5C4 */ mDoExt_brkAnm mBrk; - /* 0x5DC */ u8 mType; - /* 0x5DE */ s16 mTimer; - /* 0x5E0 */ u8 mMode; - /* 0x5E1 */ u8 field_0x5e1; - /* 0x5E2 */ s16 field_0x5e2; - /* 0x5E4 */ s16 field_0x5e4; - /* 0x5E6 */ csXyz field_0x5e6; - /* 0x5EC */ cXyz field_0x5ec; - /* 0x5F8 */ f32 field_0x5f8; - /* 0x5FC */ f32 mShakeStrength; - /* 0x600 */ f32 field_0x600; - /* 0x604 */ f32 mShakeYAmp; - /* 0x608 */ f32 mShakeDecay; - /* 0x60C */ f32 mMaxShakeDecay; - /* 0x610 */ f32 mMinShakeDecay; - /* 0x614 */ f32 mMoveStrength; - /* 0x618 */ f32 mXMoveAmp; - /* 0x61C */ f32 mZMoveAmp; - /* 0x620 */ f32 mMoveDecay; - /* 0x624 */ f32 mMaxMoveDecay; - /* 0x628 */ f32 mMinMoveDecay; - /* 0x62C */ f32 field_0x62c; - /* 0x630 */ f32 field_0x630; -}; - -class daMagLiftRot_HIO_c : public mDoHIO_entry_c { -public: - /* 80C8E94C */ daMagLiftRot_HIO_c(); - /* 80C8FA3C */ virtual ~daMagLiftRot_HIO_c(); - - /* 0x04 */ u8 mWaitTime; - /* 0x08 */ f32 mInitSpeed; - /* 0x0C */ f32 mAcceleration; - /* 0x10 */ f32 mMaxSpeed; - /* 0x14 */ f32 mShakeStrength; - /* 0x18 */ f32 mShakeAmpY; - /* 0x1C */ f32 mShakeDecay; - /* 0x20 */ f32 mMaxShakeDecay; - /* 0x24 */ f32 mMinShakeDecay; - /* 0x28 */ f32 mMoveAmpX; - /* 0x2C */ f32 mMoveAmpZ; - /* 0x30 */ f32 mMoveStrength; - /* 0x34 */ f32 mMoveDecay; - /* 0x38 */ f32 mMaxMoveDecay; - /* 0x3C */ f32 mMinMoveDecay; -}; // // Forward References: @@ -324,25 +253,30 @@ SECTION_DATA static u32 selLabel_3963[] = {Z2SE_OBJ_MAGNELIFT_STOP_S, Z2SE_OBJ_M Z2SE_OBJ_MAGNELIFT_STOP_L}; /* 80C8FC1C-80C8FC3C -00001 0020+00 1/0 0/0 0/0 .data l_daMagLiftRot_Method */ -SECTION_DATA static void* l_daMagLiftRot_Method[8] = { - (void*)daMagLiftRot_Create__FP10fopAc_ac_c, - (void*)daMagLiftRot_Delete__FP14daMagLiftRot_c, - (void*)daMagLiftRot_Execute__FP14daMagLiftRot_c, - (void*)NULL, - (void*)daMagLiftRot_Draw__FP14daMagLiftRot_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daMagLiftRot_Method = { + (process_method_func)daMagLiftRot_Create__FP10fopAc_ac_c, + (process_method_func)daMagLiftRot_Delete__FP14daMagLiftRot_c, + (process_method_func)daMagLiftRot_Execute__FP14daMagLiftRot_c, + 0, + (process_method_func)daMagLiftRot_Draw__FP14daMagLiftRot_c, }; /* 80C8FC3C-80C8FC6C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_MagLiftRot */ -SECTION_DATA extern void* g_profile_Obj_MagLiftRot[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00380000, (void*)&g_fpcLf_Method, - (void*)0x00000634, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01ED0000, (void*)&l_daMagLiftRot_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_MagLiftRot = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_MagLiftRot, // mProcName + &g_fpcLf_Method.mBase, // sub_method + 0x00000634, // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 493, // mPriority + &l_daMagLiftRot_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C8FC6C-80C8FC78 0000DC 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ diff --git a/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm.cpp b/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm.cpp index 8f62d11357c..90ae318d136 100644 --- a/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm.cpp +++ b/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm.cpp @@ -1,283 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_magne_arm -// +/** + * @file d_a_obj_magne_arm.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct mDoExt_3DlineMat_c {}; - -struct mDoExt_3DlineMatSortPacket { - /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); -}; - -struct ResTIMG {}; - -struct _GXColor {}; - -struct dKy_tevstr_c {}; - -struct mDoExt_3DlineMat1_c { - /* 80013360 */ void init(u16, u16, ResTIMG*, int); - /* 8001373C */ void update(int, f32, _GXColor&, u16, dKy_tevstr_c*); -}; - -struct fopAc_ac_c {}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static u8 mGndCheck[84]; - static f32 mGroundY; -}; - -struct daObjMarm_c { - /* 8058F358 */ void getBpartsOffset(cXyz*); - /* 8058F3D4 */ void getDpartsOffset(cXyz*); - /* 8058F46C */ void getEpartsOffset(cXyz*); - /* 8058F504 */ void getFpartsOffset(cXyz*); - /* 8058F610 */ void getRopeStartPos(cXyz*); - /* 8058F6B4 */ void initBaseMtx(); - /* 8058F77C */ void setBaseMtx(); - /* 8058FA50 */ void Create(); - /* 8058FCF8 */ void CreateHeap(); - /* 80590244 */ void phase_0(); - /* 805902D8 */ void phase_1(); - /* 80590364 */ void phase_2(); - /* 80590460 */ void create1st(); - /* 80590504 */ void Execute(f32 (**)[3][4]); - /* 80590818 */ void action(); - /* 80590B7C */ void init_typeA_modeWait(); - /* 80590B8C */ void typeA_modeWait(); - /* 80590BE0 */ void init_typeA_modeMholeOn(); - /* 80590C48 */ void typeA_modeMholeOn(); - /* 80590C68 */ void typeA_modeLiftUp(); - /* 80590C6C */ void typeA_modeLiftDown(); - /* 80590C70 */ void init_typeA_modeRotate(); - /* 80590CE4 */ void typeA_modeRotate(); - /* 80590E24 */ void typeA_modeEnd(); - /* 80590E28 */ void init_typeB_modeWait(); - /* 80590E38 */ void typeB_modeWait(); - /* 80590E8C */ void init_typeB_modeMholeOn(); - /* 80590EF4 */ void typeB_modeMholeOn(); - /* 80590F14 */ void init_typeB_modeLiftUp(); - /* 80590F30 */ void typeB_modeLiftUp(); - /* 80591004 */ void typeB_modeLiftDown(); - /* 805910E8 */ void init_typeB_modeRotate(); - /* 80591160 */ void typeB_modeRotate(); - /* 805912AC */ void typeB_modeEnd(); - /* 805912B0 */ void init_typeC_modeWait(); - /* 805912C0 */ void typeC_modeWait(); - /* 80591314 */ void init_typeC_modeMholeOn(); - /* 8059137C */ void typeC_modeMholeOn(); - /* 8059139C */ void init_typeC_modeLiftUp(); - /* 805913B8 */ void typeC_modeLiftUp(); - /* 8059148C */ void init_typeC_modeLiftDown(); - /* 805914A8 */ void typeC_modeLiftDown(); - /* 8059158C */ void init_typeC_modeRotate(); - /* 80591604 */ void typeC_modeRotate(); - /* 80591750 */ void typeC_modeEnd(); - /* 80591754 */ void init_typeD_modeWait(); - /* 80591764 */ void typeD_modeWait(); - /* 805917B8 */ void init_typeD_modeMholeOn(); - /* 80591820 */ void typeD_modeMholeOn(); - /* 80591840 */ void init_typeD_modeLiftUp(); - /* 8059185C */ void typeD_modeLiftUp(); - /* 80591930 */ void init_typeD_modeLiftDown(); - /* 8059194C */ void typeD_modeLiftDown(); - /* 80591A30 */ void init_typeD_modeRotate(); - /* 80591AA8 */ void typeD_modeRotate(); - /* 80591BF4 */ void typeD_modeEnd(); - /* 80591BF8 */ void setMagneHoleEffect(); - /* 80591BFC */ void endMagneHoleEffect(); - /* 80591C38 */ void calcHimo(); - /* 80591E18 */ void seStart_MOVESTART(); - /* 80591E80 */ void seStartLevel_MOVE(); - /* 80591EE8 */ void seStart_STOP(); - /* 80591F50 */ void seStartLevel_UP(); - /* 80591FB8 */ void seStartLevel_DOWN(); - /* 80592020 */ void seStart_SWING(); - /* 80592088 */ void Draw(); - /* 805923C4 */ void debugDraw(); - /* 805923C8 */ void Delete(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80592624 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 805926F0 */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80592680 */ ~dBgS_AcchCir(); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct dAttLook_c { - /* 80073D08 */ void request(fopAc_ac_c*, f32, f32, f32, s16, int); -}; - -struct cM3dGCyl { - /* 80592594 */ ~cM3dGCyl(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 805925DC */ ~cM3dGAab(); -}; - -struct cCcD_GStts { - /* 805927CC */ ~cCcD_GStts(); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct _GXTexObj {}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 805901FC */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -437,9 +165,6 @@ extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_27(); extern "C" void _savegpr_28(); @@ -447,10 +172,7 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void abs(); extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -460,8 +182,6 @@ extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" u8 mGndCheck__11fopAcM_gc_c[84]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -1128,25 +848,30 @@ SECTION_DATA static u8 l_func_typeD[72] = { #pragma pop /* 80592C6C-80592C8C -00001 0020+00 1/0 0/0 0/0 .data daObjMarm_METHODS */ -SECTION_DATA static void* daObjMarm_METHODS[8] = { - (void*)daObjMarm_create1st__FP11daObjMarm_c, - (void*)daObjMarm_MoveBGDelete__FP11daObjMarm_c, - (void*)daObjMarm_MoveBGExecute__FP11daObjMarm_c, - (void*)NULL, - (void*)daObjMarm_MoveBGDraw__FP11daObjMarm_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjMarm_METHODS = { + (process_method_func)daObjMarm_create1st__FP11daObjMarm_c, + (process_method_func)daObjMarm_MoveBGDelete__FP11daObjMarm_c, + (process_method_func)daObjMarm_MoveBGExecute__FP11daObjMarm_c, + 0, + (process_method_func)daObjMarm_MoveBGDraw__FP11daObjMarm_c, }; /* 80592C8C-80592CBC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_MagneArm */ -SECTION_DATA extern void* g_profile_Obj_MagneArm[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00C60000, (void*)&g_fpcLf_Method, - (void*)0x00000A6C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02660000, (void*)&daObjMarm_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_MagneArm = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_MagneArm, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjMarm_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 614, // mPriority + &daObjMarm_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80592CBC-80592CC8 00033C 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ @@ -1223,7 +948,8 @@ asm void daObjMarm_c::CreateHeap() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm/__dt__12J3DFrameCtrlFv.s" } @@ -2085,7 +1811,8 @@ static asm void daObjMarm_create1st(daObjMarm_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm/__dt__8cM3dGCylFv.s" } @@ -2095,7 +1822,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm/__dt__8cM3dGAabFv.s" } @@ -2105,7 +1833,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm/__dt__10dCcD_GSttsFv.s" } @@ -2115,7 +1844,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm/__dt__12dBgS_AcchCirFv.s" } @@ -2125,7 +1855,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm/__dt__12dBgS_ObjAcchFv.s" } @@ -2165,7 +1896,8 @@ static asm void daObjMarm_MoveBGDraw(daObjMarm_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.cpp b/rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.cpp index d1254917784..25172acd204 100644 --- a/rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.cpp +++ b/rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.cpp @@ -1,93 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_maki -// +/** + * @file d_a_obj_maki.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_maki_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObj_Maki_HIO_c { - /* 80C8FE0C */ daObj_Maki_HIO_c(); - /* 80C9089C */ ~daObj_Maki_HIO_c(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct LIGHT_INFLUENCE {}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80C90544 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -152,14 +72,10 @@ extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void _savegpr_23(); extern "C" void _savegpr_29(); extern "C" void _restgpr_23(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; @@ -167,7 +83,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -215,25 +130,30 @@ static dCcD_SrcSph cc_sph_src = { }; /* 80C909C4-80C909E4 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Maki_Method */ -SECTION_DATA static void* l_daObj_Maki_Method[8] = { - (void*)daObj_Maki_Create__FP10fopAc_ac_c, - (void*)daObj_Maki_Delete__FP14obj_maki_class, - (void*)daObj_Maki_Execute__FP14obj_maki_class, - (void*)daObj_Maki_IsDelete__FP14obj_maki_class, - (void*)daObj_Maki_Draw__FP14obj_maki_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObj_Maki_Method = { + (process_method_func)daObj_Maki_Create__FP10fopAc_ac_c, + (process_method_func)daObj_Maki_Delete__FP14obj_maki_class, + (process_method_func)daObj_Maki_Execute__FP14obj_maki_class, + (process_method_func)daObj_Maki_IsDelete__FP14obj_maki_class, + (process_method_func)daObj_Maki_Draw__FP14obj_maki_class, }; /* 80C909E4-80C90A14 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_MAKI */ -SECTION_DATA extern void* g_profile_OBJ_MAKI[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x002B0000, (void*)&g_fpcLf_Method, - (void*)0x00000730, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00320000, (void*)&l_daObj_Maki_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_MAKI = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_MAKI, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(obj_maki_class), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 50, // mPriority + &l_daObj_Maki_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C90A14-80C90A20 0000A0 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGSph */ @@ -390,7 +310,8 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_maki/d_a_obj_maki/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.cpp b/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.cpp index c0faa43994a..02a98f9d700 100644 --- a/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.cpp +++ b/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_master_sword -// +/** + * @file d_a_obj_master_sword.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.h" #include "d/a/d_a_player.h" @@ -9,57 +9,6 @@ #include "d/meter/d_meter2_info.h" #include "dol2asm.h" -// -// Types: -// - -class daObjMasterSword_c; -typedef void (daObjMasterSword_c::*actionFunc)(); - -class daObjMasterSword_c : public fopAc_ac_c { -public: - enum Mode_e { - MODE_0_e, - }; - - /* 80C90AF8 */ void initWait(); - /* 80C90B50 */ void executeWait(); - /* 80C90C50 */ static int createHeapCallBack(fopAc_ac_c* i_this); - /* 80C90C70 */ int CreateHeap(); - /* 80C90DB8 */ int create(); - /* 80C90F6C */ void create_init(); - /* 80C91448 */ ~daObjMasterSword_c(); - /* 80C91714 */ int draw(); - - inline void initCollision(); - inline void setCollision(); - inline void initBaseMtx(); - inline void setAction(Mode_e i_mode); - inline void callInit(); - inline void callExecute(); - inline int execute(); - - f32 attr() const { return mAttr; } - - u8 getEventID() { return (fopAcM_GetParam(this) >> 0x10) & 0xFF; } - u16 getFlagNo() { return fopAcM_GetParam(this) & 0xFFFF; } - - static f32 const mAttr; - // static actionFunc ActionTable[]; - static u8 ActionTable[24]; - - /* 0x568 */ J3DModel* mpModel; - /* 0x56C */ request_of_phase_process_class mPhase; - /* 0x574 */ mDoExt_btkAnm mBtk; - /* 0x58C */ mDoExt_brkAnm mBrk; - /* 0x5A4 */ dCcD_Stts mCcStts; - /* 0x5E0 */ dCcD_Cyl mCyl; - /* 0x71C */ actionFunc* mActionFunc; - /* 0x720 */ Mode_e mMode; - /* 0x724 */ u32 mShadowKey; - /* 0x728 */ cBgS_PolyInfo field_0x728; - /* 0x738 */ f32 field_0x738; -}; // // Forward References: @@ -320,25 +269,30 @@ SECTION_DATA static u8 data_80C919D0[68] = { }; /* 80C91A14-80C91A34 -00001 0020+00 1/0 0/0 0/0 .data l_daObjMasterSword_Method */ -SECTION_DATA static void* l_daObjMasterSword_Method[8] = { - (void*)daObjMasterSword_Create__FP10fopAc_ac_c, - (void*)daObjMasterSword_Delete__FP18daObjMasterSword_c, - (void*)daObjMasterSword_Execute__FP18daObjMasterSword_c, - (void*)daObjMasterSword_IsDelete__FP18daObjMasterSword_c, - (void*)daObjMasterSword_Draw__FP18daObjMasterSword_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjMasterSword_Method = { + (process_method_func)daObjMasterSword_Create__FP10fopAc_ac_c, + (process_method_func)daObjMasterSword_Delete__FP18daObjMasterSword_c, + (process_method_func)daObjMasterSword_Execute__FP18daObjMasterSword_c, + (process_method_func)daObjMasterSword_IsDelete__FP18daObjMasterSword_c, + (process_method_func)daObjMasterSword_Draw__FP18daObjMasterSword_c, }; /* 80C91A34-80C91A64 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_MasterSword */ -SECTION_DATA extern void* g_profile_Obj_MasterSword[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01840000, (void*)&g_fpcLf_Method, - (void*)0x0000073C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02320000, (void*)&l_daObjMasterSword_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_MasterSword = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_MasterSword, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjMasterSword_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 562, // mPriority + &l_daObjMasterSword_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C91A64-80C91A70 0000E8 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */ diff --git a/rel/d/a/obj/d_a_obj_mato/d_a_obj_mato.cpp b/rel/d/a/obj/d_a_obj_mato/d_a_obj_mato.cpp index 9bcbb25980c..daa60ff6adc 100644 --- a/rel/d/a/obj/d_a_obj_mato/d_a_obj_mato.cpp +++ b/rel/d/a/obj/d_a_obj_mato/d_a_obj_mato.cpp @@ -1,136 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_mato -// +/** + * @file d_a_obj_mato.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_mato/d_a_obj_mato.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObjMATO_c { - /* 80C91B58 */ void setAction(void (daObjMATO_c::*)(int), int); - /* 80C91D48 */ void action(); - /* 80C91DE4 */ void hit_check(); - /* 80C91ECC */ void start_wait(int); - /* 80C91F74 */ void wait(int); - /* 80C92044 */ void disappear(int); - /* 80C921A8 */ void getRupee(int); - /* 80C922AC */ void execute(); - /* 80C92380 */ void _delete(); - /* 80C9243C */ void setBaseMtx(); - /* 80C92650 */ void mato_init(); - /* 80C927AC */ void create(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct J3DModel {}; - -struct dComIfG_play_c { - /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); - /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); - /* 8002CB68 */ void entrySimpleModel(J3DModel*, int); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); - /* 80C92B9C */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 80084658 */ void ChkCoHit(); - /* 800846F0 */ void GetCoHitObj(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80C92B0C */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80C92B54 */ ~cM3dGAab(); -}; - -struct cCcD_Obj { - /* 80263A48 */ void GetAc(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80C92C00 */ ~cCcD_GStts(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct MatoData_s { - /* 80C92924 */ ~MatoData_s(); - /* 80C92A50 */ MatoData_s(); -}; // // Forward References: @@ -198,7 +74,6 @@ extern "C" void SetR__8cM3dGCylFf(); extern "C" void cLib_chaseF__FPfff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); extern "C" void __construct_array(); extern "C" void __ptmf_test(); extern "C" void __ptmf_scall(); @@ -214,8 +89,6 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -223,7 +96,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // @@ -573,25 +445,30 @@ asm void daObjMATO_c::create() { /* ############################################################################################## */ /* 80C92D5C-80C92D7C -00001 0020+00 1/0 0/0 0/0 .data l_daObjMATO_Method */ -SECTION_DATA static void* l_daObjMATO_Method[8] = { - (void*)daObjMATO_Create__FP10fopAc_ac_c, - (void*)daObjMATO_Delete__FP11daObjMATO_c, - (void*)daObjMATO_Execute__FP11daObjMATO_c, - (void*)daObjMATO_IsDelete__FP11daObjMATO_c, - (void*)daObjMATO_Draw__FP11daObjMATO_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjMATO_Method = { + (process_method_func)daObjMATO_Create__FP10fopAc_ac_c, + (process_method_func)daObjMATO_Delete__FP11daObjMATO_c, + (process_method_func)daObjMATO_Execute__FP11daObjMATO_c, + (process_method_func)daObjMATO_IsDelete__FP11daObjMATO_c, + (process_method_func)daObjMATO_Draw__FP11daObjMATO_c, }; /* 80C92D7C-80C92DAC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Mato */ -SECTION_DATA extern void* g_profile_Obj_Mato[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x013A0000, (void*)&g_fpcLf_Method, - (void*)0x000039F8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01B90000, (void*)&l_daObjMATO_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Mato = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Mato, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjMATO_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 441, // mPriority + &l_daObjMATO_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C92DAC-80C92DB8 0000D0 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -646,7 +523,8 @@ asm MatoData_s::MatoData_s() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_mato/d_a_obj_mato/__dt__8cM3dGCylFv.s" } @@ -656,7 +534,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_mato/d_a_obj_mato/__dt__8cM3dGAabFv.s" } @@ -666,7 +545,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_mato/d_a_obj_mato/__dt__10dCcD_GSttsFv.s" } @@ -682,7 +562,8 @@ static bool daObjMATO_IsDelete(daObjMATO_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_mato/d_a_obj_mato/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_metalbox/d_a_obj_metalbox.cpp b/rel/d/a/obj/d_a_obj_metalbox/d_a_obj_metalbox.cpp index 50f6f7177e2..baa05aea66e 100644 --- a/rel/d/a/obj/d_a_obj_metalbox/d_a_obj_metalbox.cpp +++ b/rel/d/a/obj/d_a_obj_metalbox/d_a_obj_metalbox.cpp @@ -1,106 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_metalbox -// +/** + * @file d_a_obj_metalbox.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_metalbox/d_a_obj_metalbox.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjMBox_c { - /* 80592E98 */ void initBaseMtx(); - /* 80592ED4 */ void setBaseMtx(); - /* 80592F48 */ void Create(); - /* 80592FD4 */ void CreateHeap(); - /* 80593044 */ void create(); - /* 805932C4 */ void Execute(f32 (**)[3][4]); - /* 805932F0 */ void Draw(); - /* 80593394 */ void Delete(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); -}; - -struct dBgW {}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80593254 */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); -}; - -struct cM3dGCyl { - /* 805931C4 */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 8059320C */ ~cM3dGAab(); -}; - -struct J3DModel {}; // // Forward References: @@ -156,12 +61,8 @@ extern "C" void __ct__12dCcD_GObjInfFv(); extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -169,8 +70,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; // // Declarations: @@ -233,25 +132,30 @@ asm void daObjMBox_c::CreateHeap() { /* ############################################################################################## */ /* 80593480-805934A0 -00001 0020+00 1/0 0/0 0/0 .data l_daObjMBox_Method */ -SECTION_DATA static void* l_daObjMBox_Method[8] = { - (void*)daObjMBox_Create__FP10fopAc_ac_c, - (void*)daObjMBox_Delete__FP11daObjMBox_c, - (void*)daObjMBox_Execute__FP11daObjMBox_c, - (void*)NULL, - (void*)daObjMBox_Draw__FP11daObjMBox_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjMBox_Method = { + (process_method_func)daObjMBox_Create__FP10fopAc_ac_c, + (process_method_func)daObjMBox_Delete__FP11daObjMBox_c, + (process_method_func)daObjMBox_Execute__FP11daObjMBox_c, + 0, + (process_method_func)daObjMBox_Draw__FP11daObjMBox_c, }; /* 805934A0-805934D0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_MetalBox */ -SECTION_DATA extern void* g_profile_Obj_MetalBox[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00790000, (void*)&g_fpcLf_Method, - (void*)0x00000944, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01F20000, (void*)&l_daObjMBox_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_MetalBox = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_MetalBox, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjMBox_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 498, // mPriority + &l_daObjMBox_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 805934D0-805934DC 000054 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ @@ -309,7 +213,8 @@ asm void daObjMBox_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_metalbox/d_a_obj_metalbox/__dt__8cM3dGCylFv.s" } @@ -319,7 +224,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_metalbox/d_a_obj_metalbox/__dt__8cM3dGAabFv.s" } @@ -329,7 +235,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_metalbox/d_a_obj_metalbox/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_mhole/d_a_obj_mhole.cpp b/rel/d/a/obj/d_a_obj_mhole/d_a_obj_mhole.cpp index 73db8897af4..daad7fcee0b 100644 --- a/rel/d/a/obj/d_a_obj_mhole/d_a_obj_mhole.cpp +++ b/rel/d/a/obj/d_a_obj_mhole/d_a_obj_mhole.cpp @@ -1,118 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_mhole -// +/** + * @file d_a_obj_mhole.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_mhole/d_a_obj_mhole.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObjMHole_c { - /* 80C92FD8 */ void initBaseMtx(); - /* 80C93014 */ void setBaseMtx(); - /* 80C9307C */ void Create(); - /* 80C93198 */ void checkParent(); - /* 80C93204 */ void CreateHeap(); - /* 80C934E0 */ void create(); - /* 80C936A8 */ void execute(); - /* 80C93928 */ void effectSet(); - /* 80C93A88 */ void effectEnd(); - /* 80C93ADC */ void draw(); - /* 80C93CAC */ void _delete(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData { - /* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]); -}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDFF8 */ void deleteObject(); -}; - -struct J3DTexMtxInfo { - /* 80325794 */ void setEffectMtx(f32 (*)[4]); -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80C93498 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -187,18 +81,12 @@ extern "C" void __dl__FPv(); extern "C" void setEffectMtx__13J3DTexMtxInfoFPA4_f(); extern "C" void simpleCalcMaterial__12J3DModelDataFUsPA4_f(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void C_MTXLightPerspective(); -extern "C" void PSMTXMultVec(); extern "C" void _savegpr_25(); extern "C" void _savegpr_26(); extern "C" void _savegpr_29(); extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" void _restgpr_29(); -extern "C" extern u8 const j3dDefaultMtx[48]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cps[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CpsAttr[25]; @@ -206,8 +94,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; // // Declarations: @@ -422,25 +308,30 @@ COMPILER_STRIP_GATE(0x80C93DE8, &lit_3823); #pragma pop /* 80C93E68-80C93E88 -00001 0020+00 1/0 0/0 0/0 .data l_daObjMHole_Method */ -SECTION_DATA static void* l_daObjMHole_Method[8] = { - (void*)daObjMHole_Create__FP10fopAc_ac_c, - (void*)daObjMHole_Delete__FP12daObjMHole_c, - (void*)daObjMHole_Execute__FP12daObjMHole_c, - (void*)NULL, - (void*)daObjMHole_Draw__FP12daObjMHole_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjMHole_Method = { + (process_method_func)daObjMHole_Create__FP10fopAc_ac_c, + (process_method_func)daObjMHole_Delete__FP12daObjMHole_c, + (process_method_func)daObjMHole_Execute__FP12daObjMHole_c, + 0, + (process_method_func)daObjMHole_Draw__FP12daObjMHole_c, }; /* 80C93E88-80C93EB8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_MHole */ -SECTION_DATA extern void* g_profile_Obj_MHole[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01610000, (void*)&g_fpcLf_Method, - (void*)0x00000734, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x024D0000, (void*)&l_daObjMHole_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_MHole = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_MHole, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjMHole_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 589, // mPriority + &l_daObjMHole_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C93EB8-80C93EC4 0000A4 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGAab */ @@ -471,7 +362,8 @@ asm void daObjMHole_c::CreateHeap() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_mhole/d_a_obj_mhole/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_mie/d_a_obj_mie.cpp b/rel/d/a/obj/d_a_obj_mie/d_a_obj_mie.cpp index 33817bc4a5c..a29f381f97a 100644 --- a/rel/d/a/obj/d_a_obj_mie/d_a_obj_mie.cpp +++ b/rel/d/a/obj/d_a_obj_mie/d_a_obj_mie.cpp @@ -1,158 +1,14 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_mie -// +/** + * @file d_a_obj_mie.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_mie/d_a_obj_mie.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObj_Mie_c { - /* 80C93FCC */ ~daObj_Mie_c(); - /* 80C941C8 */ void create(); - /* 80C945E8 */ void CreateHeap(); - /* 80C94674 */ void Delete(); - /* 80C946A8 */ void Execute(); - /* 80C95140 */ void Draw(); - /* 80C952D8 */ void createHeapCallBack(fopAc_ac_c*); - /* 80C952F8 */ void srchPouyaa(void*, void*); - /* 80C9536C */ void setEnvTevColor(); - /* 80C953C8 */ void setRoomNo(); - /* 80C9540C */ void setMtx(); - /* 80C954BC */ void calcRollAngle(s16, int); - /* 80C9555C */ void getWallAngle(s16, s16*); - /* 80C956EC */ void setSmokePrtcl(); - /* 80C95768 */ void setWaterPrtcl(); - /* 80C95890 */ void setHamonPrtcl(); -}; - -struct daObj_Mie_Param_c { - /* 80C95A40 */ ~daObj_Mie_Param_c(); - static u8 const m[44]; -}; -struct daNpc_Pouya_c { - /* 80AAE8E8 */ void getType(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B8B4 */ void forceOnEventMove(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct _GXTexObj {}; - -struct dDlst_shadowControl_c { - /* 80055F84 */ void setSimple(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*); - - static u8 mSimpleTexObj[32]; -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80C94578 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F40 */ void SetWallR(f32); - /* 80C94470 */ ~dBgS_AcchCir(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct dBgS { - /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_LinChk {}; - -struct cBgS_GndChk { - /* 80267C1C */ cBgS_GndChk(); - /* 80267C94 */ ~cBgS_GndChk(); -}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -264,9 +120,6 @@ extern "C" void cLib_addCalcAngleS2__FPssss(); extern "C" void cLib_chaseF__FPfff(); extern "C" void cLib_chaseAngleS__FPsss(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void _savegpr_23(); extern "C" void _savegpr_25(); extern "C" void _savegpr_27(); @@ -275,8 +128,6 @@ extern "C" void _restgpr_23(); extern "C" void _restgpr_25(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -285,7 +136,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" void getType__13daNpc_Pouya_cFv(); extern "C" void __register_global_object(); @@ -334,25 +184,30 @@ SECTION_DATA static u8 emttrId[8] = { }; /* 80C95BE4-80C95C04 -00001 0020+00 1/0 0/0 0/0 .data daObj_Mie_MethodTable */ -SECTION_DATA static void* daObj_Mie_MethodTable[8] = { - (void*)daObj_Mie_Create__FPv, - (void*)daObj_Mie_Delete__FPv, - (void*)daObj_Mie_Execute__FPv, - (void*)daObj_Mie_IsDelete__FPv, - (void*)daObj_Mie_Draw__FPv, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObj_Mie_MethodTable = { + (process_method_func)daObj_Mie_Create__FPv, + (process_method_func)daObj_Mie_Delete__FPv, + (process_method_func)daObj_Mie_Execute__FPv, + (process_method_func)daObj_Mie_IsDelete__FPv, + (process_method_func)daObj_Mie_Draw__FPv, }; /* 80C95C04-80C95C34 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_MIE */ -SECTION_DATA extern void* g_profile_OBJ_MIE[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01310000, (void*)&g_fpcLf_Method, - (void*)0x00000A50, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00560000, (void*)&daObj_Mie_MethodTable, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_MIE = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_MIE, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObj_Mie_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 86, // mPriority + &daObj_Mie_MethodTable, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C95C34-80C95C40 0000AC 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGPla */ @@ -481,7 +336,8 @@ extern "C" asm void __dt__8cM3dGAabFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_mie/d_a_obj_mie/__dt__12dBgS_AcchCirFv.s" } @@ -513,7 +369,8 @@ extern "C" asm void __dt__4cXyzFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_mie/d_a_obj_mie/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.cpp b/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.cpp index 185a7620114..9378213657b 100644 --- a/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.cpp +++ b/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_movebox -// +/** + * @file d_a_obj_movebox.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.h" #include "d/d_path.h" @@ -1096,16 +1096,30 @@ SECTION_DATA static u8 data_80481748[36] = { /* 8048176C-8048178C -00001 0020+00 1/0 0/0 0/0 .data * Mthd_Table__Q212daObjMovebox29@unnamed@d_a_obj_movebox_cpp@ */ -SECTION_DATA static void* data_8048176C[8] = { - (void*)func_80480920, (void*)func_80480BC0, (void*)func_80480C18, (void*)func_80480C64, - (void*)func_80480C38, (void*)NULL, (void*)NULL, (void*)NULL, +static actor_method_class data_8048176C = { + (process_method_func)func_80480920, + (process_method_func)func_80480BC0, + (process_method_func)func_80480C18, + (process_method_func)func_80480C64, + (process_method_func)func_80480C38, }; /* 8048178C-804817BC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Movebox */ -SECTION_DATA extern void* g_profile_Obj_Movebox[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, (void*)0x001D0000, (void*)&g_fpcLf_Method, - (void*)0x0000090C, (void*)NULL, (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00110000, (void*)&data_8048176C, (void*)0x00040504, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Movebox = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Movebox, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjMovebox), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 17, // mPriority + &data_8048176C, // sub_method + 0x00040504, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 804817BC-804817C8 0000B8 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ diff --git a/rel/d/a/obj/d_a_obj_msima/d_a_obj_msima.cpp b/rel/d/a/obj/d_a_obj_msima/d_a_obj_msima.cpp index cfe955f9d8e..e049ccef4a8 100644 --- a/rel/d/a/obj/d_a_obj_msima/d_a_obj_msima.cpp +++ b/rel/d/a/obj/d_a_obj_msima/d_a_obj_msima.cpp @@ -1,157 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_msima -// +/** + * @file d_a_obj_msima.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_msima/d_a_obj_msima.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_msima_class {}; - -struct ms_chain_s { - /* 80C9CA60 */ ~ms_chain_s(); - /* 80C9CA9C */ ms_chain_s(); -}; - -struct mDoMtx_stack_c { - /* 8000CCC8 */ void push(); - /* 8000CD14 */ void pop(); - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE38 */ void scaleM(f32, f32, f32); - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daPy_py_c { - static u8 m_midnaActor[4]; -}; - -struct daObj_Msima_HIO_c { - /* 80C9B40C */ daObj_Msima_HIO_c(); - /* 80C9CAA0 */ ~daObj_Msima_HIO_c(); -}; - -struct dSv_memBit_c { - /* 80034934 */ void isDungeonItem(int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct Vec {}; - -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266B84 */ void operator*(f32) const; - /* 80C9B890 */ ~cXyz(); -}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS_PolyInfo {}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDFF8 */ void deleteObject(); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80C9C720 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -236,9 +92,6 @@ extern "C" void __ct__16Z2SoundObjSimpleFv(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void __construct_array(); extern "C" void _savegpr_20(); extern "C" void _savegpr_22(); @@ -252,12 +105,8 @@ extern "C" void _restgpr_24(); extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u8 struct_80450C98[4]; extern "C" u8 m_midnaActor__9daPy_py_c[4]; @@ -278,25 +127,30 @@ SECTION_RODATA static f32 const lit_3864 = 800.0f; COMPILER_STRIP_GATE(0x80C9CD50, &lit_3864); /* 80C9CDF8-80C9CE18 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Msima_Method */ -SECTION_DATA static void* l_daObj_Msima_Method[8] = { - (void*)daObj_Msima_Create__FP10fopAc_ac_c, - (void*)daObj_Msima_Delete__FP15obj_msima_class, - (void*)daObj_Msima_Execute__FP15obj_msima_class, - (void*)daObj_Msima_IsDelete__FP15obj_msima_class, - (void*)daObj_Msima_Draw__FP15obj_msima_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObj_Msima_Method = { + (process_method_func)daObj_Msima_Create__FP10fopAc_ac_c, + (process_method_func)daObj_Msima_Delete__FP15obj_msima_class, + (process_method_func)daObj_Msima_Execute__FP15obj_msima_class, + (process_method_func)daObj_Msima_IsDelete__FP15obj_msima_class, + (process_method_func)daObj_Msima_Draw__FP15obj_msima_class, }; /* 80C9CE18-80C9CE48 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_MSIMA */ -SECTION_DATA extern void* g_profile_OBJ_MSIMA[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x007B0000, (void*)&g_fpcLf_Method, - (void*)0x000008A4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00330000, (void*)&l_daObj_Msima_Method, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_MSIMA = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_MSIMA, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(obj_msima_class), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 51, // mPriority + &l_daObj_Msima_Method, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C9CE48-80C9CE54 000050 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ @@ -540,7 +394,8 @@ static asm void msima_drop(obj_msima_class* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_msima/d_a_obj_msima/__dt__4cXyzFv.s" } @@ -843,7 +698,8 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_msima/d_a_obj_msima/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_mvstair/d_a_obj_mvstair.cpp b/rel/d/a/obj/d_a_obj_mvstair/d_a_obj_mvstair.cpp index b1d97d3d379..da6c4f2900b 100644 --- a/rel/d/a/obj/d_a_obj_mvstair/d_a_obj_mvstair.cpp +++ b/rel/d/a/obj/d_a_obj_mvstair/d_a_obj_mvstair.cpp @@ -1,155 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_mvstair -// +/** + * @file d_a_obj_mvstair.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_mvstair/d_a_obj_mvstair.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct cXyz { - /* 80C9DEDC */ ~cXyz(); - /* 80C9E700 */ cXyz(); -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjStair_c { - /* 80C9D098 */ void initBaseMtx(); - /* 80C9D0D4 */ void setBaseMtx(); - /* 80C9D148 */ void Create(); - /* 80C9D2B8 */ void CreateHeap(); - /* 80C9D338 */ void create1st(); - /* 80C9D41C */ void event_proc_call(); - /* 80C9D4D8 */ void mode_proc_call(); - /* 80C9D594 */ void Execute(f32 (**)[3][4]); - /* 80C9D710 */ void Draw(); - /* 80C9D7B4 */ void Delete(); - /* 80C9D82C */ void actionWait(); - /* 80C9D8EC */ void actionOrderEvent(); - /* 80C9D95C */ void actionEvent(); - /* 80C9D9BC */ bool actionEnd(); - /* 80C9D9C4 */ void modeWaitUpperInit(); - /* 80C9D9F4 */ void modeWaitUpper(); - /* 80C9DA98 */ void modeUpperInit(); - /* 80C9DADC */ void modeUpper(); - /* 80C9DF18 */ void modeWaitLowerInit(); - /* 80C9DF60 */ void modeWaitLower(); - /* 80C9E004 */ void modeLowerInit(); - /* 80C9E034 */ void modeLower(); - /* 80C9E3D8 */ void setParticle(); - /* 80C9E5A0 */ void removeParticle(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack { - /* 80C9E788 */ void cleanup(); - /* 80C9E820 */ ~dPa_levelEcallBack(); -}; - -struct dPa_followEcallBack { - /* 80049580 */ dPa_followEcallBack(u8, u8); - /* 80C9E704 */ ~dPa_followEcallBack(); - /* 80C9E78C */ void __defctor(); -}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dEvent_manager_c { - /* 80047698 */ void getEventIdx(fopAc_ac_c*, u8); - /* 80047A78 */ void endCheck(s16); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JPABaseEmitter {}; - -struct JPAEmitterCallBack { - /* 8027E6A4 */ ~JPAEmitterCallBack(); - /* 80C9E894 */ void execute(JPABaseEmitter*); - /* 80C9E898 */ void executeAfter(JPABaseEmitter*); - /* 80C9E89C */ void draw(JPABaseEmitter*); - /* 80C9E8A0 */ void drawAfter(JPABaseEmitter*); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -233,22 +89,15 @@ extern "C" void __dt__18JPAEmitterCallBackFv(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void __construct_array(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__19dPa_followEcallBack[10]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 struct_80C9EAA8[4]; @@ -680,7 +529,8 @@ asm void daObjStair_c::modeUpper() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_mvstair/d_a_obj_mvstair/__dt__4cXyzFv.s" } @@ -749,25 +599,30 @@ asm void daObjStair_c::removeParticle() { /* ############################################################################################## */ /* 80C9EA08-80C9EA28 -00001 0020+00 1/0 0/0 0/0 .data daObjStair_METHODS */ -SECTION_DATA static void* daObjStair_METHODS[8] = { - (void*)daObjStair_create1st__FP12daObjStair_c, - (void*)daObjStair_MoveBGDelete__FP12daObjStair_c, - (void*)daObjStair_MoveBGExecute__FP12daObjStair_c, - (void*)NULL, - (void*)daObjStair_MoveBGDraw__FP12daObjStair_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjStair_METHODS = { + (process_method_func)daObjStair_create1st__FP12daObjStair_c, + (process_method_func)daObjStair_MoveBGDelete__FP12daObjStair_c, + (process_method_func)daObjStair_MoveBGExecute__FP12daObjStair_c, + 0, + (process_method_func)daObjStair_MoveBGDraw__FP12daObjStair_c, }; /* 80C9EA28-80C9EA58 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_MvStair */ -SECTION_DATA extern void* g_profile_Obj_MvStair[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x005C0000, (void*)&g_fpcLf_Method, - (void*)0x0000066C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00190000, (void*)&daObjStair_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_MvStair = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_MvStair, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjStair_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 25, // mPriority + &daObjStair_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C9EA58-80C9EA7C 000138 0024+00 2/2 0/0 0/0 .data __vt__18dPa_levelEcallBack */ @@ -808,7 +663,8 @@ static asm void daObjStair_create1st(daObjStair_c* param_0) { #pragma pop /* 80C9E700-80C9E704 0016E0 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */ -cXyz::cXyz() { +// cXyz::cXyz() { +extern "C" asm void __ct__4cXyzFv() { /* empty function */ } @@ -816,14 +672,16 @@ cXyz::cXyz() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dPa_followEcallBack::~dPa_followEcallBack() { +// asm dPa_followEcallBack::~dPa_followEcallBack() { +extern "C" asm void __dt__19dPa_followEcallBackFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_mvstair/d_a_obj_mvstair/__dt__19dPa_followEcallBackFv.s" } #pragma pop /* 80C9E788-80C9E78C 001768 0004+00 1/0 0/0 0/0 .text cleanup__18dPa_levelEcallBackFv */ -void dPa_levelEcallBack::cleanup() { +// void dPa_levelEcallBack::cleanup() { +extern "C" asm void cleanup__18dPa_levelEcallBackFv() { /* empty function */ } @@ -832,7 +690,8 @@ void dPa_levelEcallBack::cleanup() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dPa_followEcallBack::__defctor() { +// asm void dPa_followEcallBack::__defctor() { +extern "C" asm void __defctor__19dPa_followEcallBackFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_mvstair/d_a_obj_mvstair/__defctor__19dPa_followEcallBackFv.s" } @@ -873,7 +732,8 @@ static asm void daObjStair_MoveBGDraw(daObjStair_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dPa_levelEcallBack::~dPa_levelEcallBack() { +// asm dPa_levelEcallBack::~dPa_levelEcallBack() { +extern "C" asm void __dt__18dPa_levelEcallBackFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_mvstair/d_a_obj_mvstair/__dt__18dPa_levelEcallBackFv.s" } @@ -881,25 +741,29 @@ asm dPa_levelEcallBack::~dPa_levelEcallBack() { /* 80C9E894-80C9E898 001874 0004+00 1/0 0/0 0/0 .text * execute__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::execute(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::execute(JPABaseEmitter* param_0) { +extern "C" asm void execute__18JPAEmitterCallBackFP14JPABaseEmitter() { /* empty function */ } /* 80C9E898-80C9E89C 001878 0004+00 1/0 0/0 0/0 .text * executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::executeAfter(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::executeAfter(JPABaseEmitter* param_0) { +extern "C" asm void executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter() { /* empty function */ } /* 80C9E89C-80C9E8A0 00187C 0004+00 1/0 0/0 0/0 .text draw__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::draw(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::draw(JPABaseEmitter* param_0) { +extern "C" asm void draw__18JPAEmitterCallBackFP14JPABaseEmitter() { /* empty function */ } /* 80C9E8A0-80C9E8A4 001880 0004+00 1/0 0/0 0/0 .text * drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::drawAfter(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::drawAfter(JPABaseEmitter* param_0) { +extern "C" asm void drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter() { /* empty function */ } diff --git a/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.cpp b/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.cpp index fb2ceb1ebee..ba2403839a5 100644 --- a/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.cpp +++ b/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.cpp @@ -1,174 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_nagaisu -// +/** + * @file d_a_obj_nagaisu.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjNagaisu_c { - /* 80C9F3D8 */ daObjNagaisu_c(); - /* 80C9F4B8 */ ~daObjNagaisu_c(); - /* 80C9F5A8 */ void createHeap(); - /* 80C9F668 */ void create(); - /* 80C9F7A8 */ void Delete(); - /* 80C9F81C */ void draw(); - /* 80C9F8C4 */ void execute(); - /* 80C9F914 */ void init(); - /* 80C9F944 */ void setIsu(); - - static u8 const REMOVE_ISU_IDX[28]; -}; - -struct dMdl_obj_c {}; - -struct dMdl_c { - /* 8009C668 */ void entryObj(dMdl_obj_c*); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct daObjIsuChild_c { - /* 80C9FA90 */ daObjIsuChild_c(); - /* 80C9FCDC */ ~daObjIsuChild_c(); - /* 80C9FD4C */ void createHeap(); - /* 80C9FE28 */ void create(daObjNagaisu_c*, dCcD_Stts*); - /* 80C9FF54 */ void execute(); - /* 80CA0034 */ void draw(dMdl_c*); - /* 80CA00B8 */ void Delete(); - /* 80CA0118 */ void chkHit(); - /* 80CA0180 */ void callEmt(); - - static u8 const s_CcDCyl[68]; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dMdl_mng_c { - /* 8009C8D8 */ void entry(J3DModelData*, u16, int); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80C9F45C */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); - /* 80C9FAFC */ ~dCcD_Cyl(); - /* 80C9FBC8 */ dCcD_Cyl(); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80C9FC4C */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80C9FC94 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80CA030C */ ~cCcD_GStts(); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; // // Forward References: @@ -245,8 +83,6 @@ extern "C" void SetR__8cM3dGCylFf(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void _savegpr_22(); @@ -257,8 +93,6 @@ extern "C" void _restgpr_22(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -266,7 +100,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // @@ -294,25 +127,30 @@ SECTION_DEAD static char const* const stringBase_80CA0400 = "Nagaisu"; SECTION_DATA static void* l_arcName = (void*)&d_a_obj_nagaisu__stringBase0; /* 80CA040C-80CA042C -00001 0020+00 1/0 0/0 0/0 .data daObjNagaisu_METHODS */ -SECTION_DATA static void* daObjNagaisu_METHODS[8] = { - (void*)daObjNagaisu_create__FP14daObjNagaisu_c, - (void*)daObjNagaisu_Delete__FP14daObjNagaisu_c, - (void*)daObjNagaisu_execute__FP14daObjNagaisu_c, - (void*)NULL, - (void*)daObjNagaisu_draw__FP14daObjNagaisu_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjNagaisu_METHODS = { + (process_method_func)daObjNagaisu_create__FP14daObjNagaisu_c, + (process_method_func)daObjNagaisu_Delete__FP14daObjNagaisu_c, + (process_method_func)daObjNagaisu_execute__FP14daObjNagaisu_c, + 0, + (process_method_func)daObjNagaisu_draw__FP14daObjNagaisu_c, }; /* 80CA042C-80CA045C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Nagaisu */ -SECTION_DATA extern void* g_profile_Obj_Nagaisu[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x019C0000, (void*)&g_fpcLf_Method, - (void*)0x0000B6E4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02E30000, (void*)&daObjNagaisu_METHODS, - (void*)0x00040000, (void*)0x030E0000, +extern actor_process_profile_definition g_profile_Obj_Nagaisu = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Nagaisu, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjNagaisu_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 739, // mPriority + &daObjNagaisu_METHODS, // sub_method + 0x00040000, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CA045C-80CA0468 000054 000C+00 2/2 0/0 0/0 .data __vt__15daObjIsuChild_c */ @@ -372,7 +210,8 @@ SECTION_DATA extern void* __vt__10dCcD_GStts[3] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu/__dt__10dCcD_GSttsFv.s" } @@ -526,7 +365,8 @@ asm daObjIsuChild_c::daObjIsuChild_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Cyl::~dCcD_Cyl() { +// asm dCcD_Cyl::~dCcD_Cyl() { +extern "C" asm void __dt__8dCcD_CylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu/__dt__8dCcD_CylFv.s" } @@ -536,7 +376,8 @@ asm dCcD_Cyl::~dCcD_Cyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Cyl::dCcD_Cyl() { +// asm dCcD_Cyl::dCcD_Cyl() { +extern "C" asm void __ct__8dCcD_CylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu/__ct__8dCcD_CylFv.s" } @@ -546,7 +387,8 @@ asm dCcD_Cyl::dCcD_Cyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu/__dt__8cM3dGCylFv.s" } @@ -556,7 +398,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu/__dt__8cM3dGAabFv.s" } @@ -753,7 +596,8 @@ static asm void daObjNagaisu_draw(daObjNagaisu_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_nameplate/d_a_obj_nameplate.cpp b/rel/d/a/obj/d_a_obj_nameplate/d_a_obj_nameplate.cpp index 6dd15df8227..ea9f3899b74 100644 --- a/rel/d/a/obj/d_a_obj_nameplate/d_a_obj_nameplate.cpp +++ b/rel/d/a/obj/d_a_obj_nameplate/d_a_obj_nameplate.cpp @@ -1,82 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_nameplate -// +/** + * @file d_a_obj_nameplate.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_nameplate/d_a_obj_nameplate.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjNameplate_c { - /* 80594098 */ void create_init(); - /* 8059415C */ void initBaseMtx(); - /* 8059417C */ void setBaseMtx(); - /* 80594248 */ void initCcSphere(); - /* 805942B8 */ void setCcSphere(); - /* 8059434C */ void calcAngle(); - /* 805945CC */ void calcSpring(); - /* 80594754 */ void checkHitAngle(); - /* 805947F8 */ void messageProc(); - - static u8 const M_attr[32]; -}; - -struct daObj { - /* 80037900 */ void HitSeStart(cXyz const*, int, dCcD_GObjInf const*, u32); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); -}; - -struct dMsgFlow_c { - /* 80249F00 */ dMsgFlow_c(); - /* 80249F48 */ ~dMsgFlow_c(); - /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**); - /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -143,12 +74,8 @@ extern "C" void SetR__8cM3dGSphFf(); extern "C" void cLib_chaseF__FPfff(); extern "C" void cLib_distanceAngleS__Fss(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; @@ -156,8 +83,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; // @@ -421,25 +346,30 @@ static bool daObjNameplate_IsDelete(daObjNameplate_c* param_0) { /* ############################################################################################## */ /* 80594F2C-80594F4C -00001 0020+00 1/0 0/0 0/0 .data l_daObjNameplate_Method */ -SECTION_DATA static void* l_daObjNameplate_Method[8] = { - (void*)daObjNameplate_Create__FP10fopAc_ac_c, - (void*)daObjNameplate_Delete__FP16daObjNameplate_c, - (void*)daObjNameplate_Execute__FP16daObjNameplate_c, - (void*)daObjNameplate_IsDelete__FP16daObjNameplate_c, - (void*)daObjNameplate_Draw__FP16daObjNameplate_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjNameplate_Method = { + (process_method_func)daObjNameplate_Create__FP10fopAc_ac_c, + (process_method_func)daObjNameplate_Delete__FP16daObjNameplate_c, + (process_method_func)daObjNameplate_Execute__FP16daObjNameplate_c, + (process_method_func)daObjNameplate_IsDelete__FP16daObjNameplate_c, + (process_method_func)daObjNameplate_Draw__FP16daObjNameplate_c, }; /* 80594F4C-80594F7C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_NamePlate */ -SECTION_DATA extern void* g_profile_Obj_NamePlate[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01500000, (void*)&g_fpcLf_Method, - (void*)0x00000780, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00200000, (void*)&l_daObjNameplate_Method, - (void*)0x00040180, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_NamePlate = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_NamePlate, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjNameplate_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 32, // mPriority + &l_daObjNameplate_Method, // sub_method + 0x00040180, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80594F7C-80594F88 000054 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */ diff --git a/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.cpp b/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.cpp index 54f53da1c57..f6ab73916eb 100644 --- a/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.cpp +++ b/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.cpp @@ -1,243 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_nan -// +/** + * @file d_a_obj_nan.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CF0C */ void ZXYrotS(csXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; - -struct mDoExt_McaMorfSO { - /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, - int, Z2Creature*, u32, u32); - /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32); - /* 800110B0 */ void play(u32, s8); - /* 800111C0 */ void entryDL(); - /* 800111EC */ void modelCalc(); - /* 80011310 */ void stopZelAnime(); -}; - -struct fopAc_ac_c {}; - -struct daPy_boomerangMove_c { - /* 8015E5B0 */ void initOffset(cXyz const*); - /* 8015E654 */ void posMove(cXyz*, s16*, fopAc_ac_c*, s16); - /* 8015E87C */ void bgCheckAfterOffset(cXyz const*); -}; - -struct daObj_NanHIO_c { - /* 80CA05AC */ daObj_NanHIO_c(); - /* 80CA30D0 */ ~daObj_NanHIO_c(); -}; - -struct daObjNAN_c { - /* 80CA05D4 */ void setAction(void (daObjNAN_c::*)()); - /* 80CA0978 */ void nan_posMove(); - /* 80CA0A2C */ void turn(); - /* 80CA0D9C */ void nan_WalkAnm(); - /* 80CA0E7C */ void wait(); - /* 80CA1184 */ void walk(); - /* 80CA1904 */ void bin_wait(); - /* 80CA1A20 */ void bin_action(); - /* 80CA1B50 */ void nan_setParticle(); - /* 80CA1D5C */ void hook(); - /* 80CA1F60 */ void boomerang(); - /* 80CA2368 */ void drop(); - /* 80CA2658 */ void hit_check(); - /* 80CA270C */ void action(); - /* 80CA276C */ void execute(); - /* 80CA2904 */ void _delete(); - /* 80CA296C */ void setBaseMtx(); - /* 80CA2B68 */ void create(); -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dMenu_Insect_c { - /* 801D9F3C */ void isCatchNotGiveInsect(u8); -}; - -struct dInsect_c { - /* 8015E010 */ dInsect_c(); - /* 8015E078 */ void Insect_GetDemoMain(); - /* 8015E26C */ void CalcZBuffer(f32); - /* 80CA3154 */ void Insect_Release(); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcSph {}; - -struct dCcD_Sph { - /* 80084A34 */ void Set(dCcD_SrcSph const&); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); - /* 80CA306C */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 800844F8 */ void GetTgHitObj(); - /* 80084548 */ void GetTgHitGObj(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct cM3dGSph { - /* 8026F648 */ void SetC(cXyz const&); - /* 8026F708 */ void SetR(f32); - /* 80CA2FDC */ ~cM3dGSph(); -}; - -struct cM3dGPla { - /* 80CA0D54 */ ~cM3dGPla(); -}; - -struct cM3dGAab { - /* 80CA3024 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80CA3160 */ ~cCcD_GStts(); -}; - -struct cBgS_PolyInfo {}; - -struct cBgS_LinChk {}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 800744A0 */ void GroundCross(cBgS_GndChk*); - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct _GXTexObj {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80CA08EC */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -356,10 +125,6 @@ extern "C" void init__10Z2CreatureFP3VecP3VecUcUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); -extern "C" void PSVECSquareDistance(); extern "C" void __ptmf_test(); extern "C" void __ptmf_scall(); extern "C" void __cvt_fp2unsigned(); @@ -369,9 +134,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void strcmp(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -381,8 +143,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u32 __float_nan; extern "C" void __register_global_object(); // @@ -554,25 +314,30 @@ SECTION_DATA static void* lit_4941[3] = { #pragma pop /* 80CA33D0-80CA33F0 -00001 0020+00 1/0 0/0 0/0 .data l_daObjNAN_Method */ -SECTION_DATA static void* l_daObjNAN_Method[8] = { - (void*)daObjNAN_Create__FP10fopAc_ac_c, - (void*)daObjNAN_Delete__FP10daObjNAN_c, - (void*)daObjNAN_Execute__FP10daObjNAN_c, - (void*)daObjNAN_IsDelete__FP10daObjNAN_c, - (void*)daObjNAN_Draw__FP10daObjNAN_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjNAN_Method = { + (process_method_func)daObjNAN_Create__FP10fopAc_ac_c, + (process_method_func)daObjNAN_Delete__FP10daObjNAN_c, + (process_method_func)daObjNAN_Execute__FP10daObjNAN_c, + (process_method_func)daObjNAN_IsDelete__FP10daObjNAN_c, + (process_method_func)daObjNAN_Draw__FP10daObjNAN_c, }; /* 80CA33F0-80CA3420 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Nan */ -SECTION_DATA extern void* g_profile_Obj_Nan[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01430000, (void*)&g_fpcLf_Method, - (void*)0x00000800, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01E00000, (void*)&l_daObjNAN_Method, - (void*)0x000C0120, (void*)0x030E0000, +extern actor_process_profile_definition g_profile_Obj_Nan = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Nan, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjNAN_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 480, // mPriority + &l_daObjNAN_Method, // sub_method + 0x000C0120, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CA3420-80CA342C 000170 000C+00 0/0 0/0 0/0 .data __vt__9dInsect_c */ @@ -725,7 +490,8 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan/__dt__12J3DFrameCtrlFv.s" } @@ -818,7 +584,8 @@ asm void daObjNAN_c::turn() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGPla::~cM3dGPla() { +// asm cM3dGPla::~cM3dGPla() { +extern "C" asm void __dt__8cM3dGPlaFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan/__dt__8cM3dGPlaFv.s" } @@ -1278,7 +1045,8 @@ asm void daObjNAN_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { +// asm cM3dGSph::~cM3dGSph() { +extern "C" asm void __dt__8cM3dGSphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan/__dt__8cM3dGSphFv.s" } @@ -1288,7 +1056,8 @@ asm cM3dGSph::~cM3dGSph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan/__dt__8cM3dGAabFv.s" } @@ -1298,7 +1067,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan/__dt__10dCcD_GSttsFv.s" } @@ -1339,7 +1109,8 @@ REGISTER_CTORS(0x80CA3118, __sinit_d_a_obj_nan_cpp); #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dInsect_c::Insect_Release() { +// asm void dInsect_c::Insect_Release() { +extern "C" asm void Insect_Release__9dInsect_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan/Insect_Release__9dInsect_cFv.s" } @@ -1349,7 +1120,8 @@ asm void dInsect_c::Insect_Release() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_ndoor/d_a_obj_ndoor.cpp b/rel/d/a/obj/d_a_obj_ndoor/d_a_obj_ndoor.cpp index 4d4a8c3158a..66840c7c1ca 100644 --- a/rel/d/a/obj/d_a_obj_ndoor/d_a_obj_ndoor.cpp +++ b/rel/d/a/obj/d_a_obj_ndoor/d_a_obj_ndoor.cpp @@ -1,54 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_ndoor -// +/** + * @file d_a_obj_ndoor.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_ndoor/d_a_obj_ndoor.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_ndoor_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dCcU_AtInfo {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -92,10 +50,6 @@ extern "C" void SetC__8cM3dGSphFRC4cXyz(); extern "C" void SetR__8cM3dGSphFf(); extern "C" void cLib_addCalc0__FPfff(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; @@ -103,7 +57,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; // @@ -237,25 +190,30 @@ static dCcD_SrcSph cc_sph_src = { }; /* 80CA3AB8-80CA3AD8 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Ndoor_Method */ -SECTION_DATA static void* l_daObj_Ndoor_Method[8] = { - (void*)daObj_Ndoor_Create__FP10fopAc_ac_c, - (void*)daObj_Ndoor_Delete__FP15obj_ndoor_class, - (void*)daObj_Ndoor_Execute__FP15obj_ndoor_class, - (void*)daObj_Ndoor_IsDelete__FP15obj_ndoor_class, - (void*)daObj_Ndoor_Draw__FP15obj_ndoor_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObj_Ndoor_Method = { + (process_method_func)daObj_Ndoor_Create__FP10fopAc_ac_c, + (process_method_func)daObj_Ndoor_Delete__FP15obj_ndoor_class, + (process_method_func)daObj_Ndoor_Execute__FP15obj_ndoor_class, + (process_method_func)daObj_Ndoor_IsDelete__FP15obj_ndoor_class, + (process_method_func)daObj_Ndoor_Draw__FP15obj_ndoor_class, }; /* 80CA3AD8-80CA3B08 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_NDOOR */ -SECTION_DATA extern void* g_profile_OBJ_NDOOR[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01280000, (void*)&g_fpcLf_Method, - (void*)0x00000718, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x004C0000, (void*)&l_daObj_Ndoor_Method, - (void*)0x00040100, (void*)NULL, +extern actor_process_profile_definition g_profile_OBJ_NDOOR = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_NDOOR, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(obj_ndoor_class), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 76, // mPriority + &l_daObj_Ndoor_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_0_e, // cullType }; /* 80CA3B08-80CA3B14 000090 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGSph */ diff --git a/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu.cpp b/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu.cpp index ac58aa4eea8..5bc0d02ea3a 100644 --- a/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu.cpp +++ b/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu.cpp @@ -1,162 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_nougu -// +/** + * @file d_a_obj_nougu.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObj_Nougu_c { - /* 80CA3C0C */ ~daObj_Nougu_c(); - /* 80CA3E24 */ void create(); - /* 80CA4328 */ void CreateHeap(); - /* 80CA43A0 */ void Delete(); - /* 80CA43D4 */ void Execute(); - /* 80CA45F4 */ void Draw(); - /* 80CA46B8 */ void createHeapCallBack(fopAc_ac_c*); - /* 80CA46D8 */ void getResName(); - /* 80CA46E8 */ void isDelete(); - /* 80CA4708 */ void setEnvTevColor(); - /* 80CA4764 */ void setRoomNo(); - /* 80CA47A4 */ void setMtx(); - - static u8 mCcDSph[64]; -}; - -struct daObj_Nougu_Param_c { - /* 80CA494C */ ~daObj_Nougu_Param_c(); - - static u8 const m[16]; -}; - -struct daNpcT_c { - static u8 const mCcDObjData[48]; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcSph {}; - -struct dCcD_Sph { - /* 80084A34 */ void Set(dCcD_SrcSph const&); - /* 80CA3D58 */ ~dCcD_Sph(); - /* 80CA40D8 */ dCcD_Sph(); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80CA425C */ ~dCcD_GStts(); -}; -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80CA42B8 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80CA41EC */ ~dBgS_AcchCir(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct dBgS { - /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGSph { - /* 8026F648 */ void SetC(cXyz const&); - /* 8026F708 */ void SetR(f32); - /* 80CA415C */ ~cM3dGSph(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 80CA41A4 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80CA4890 */ ~cCcD_GStts(); -}; - -struct cBgS_GndChk { - /* 80267C1C */ cBgS_GndChk(); - /* 80267C94 */ ~cBgS_GndChk(); -}; - -struct _GXTexObj {}; - -struct J3DModel {}; // // Forward References: @@ -236,17 +86,11 @@ extern "C" void __dt__8cM3dGCirFv(); extern "C" void SetC__8cM3dGSphFRC4cXyz(); extern "C" void SetR__8cM3dGSphFf(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void _savegpr_24(); extern "C" void _restgpr_24(); extern "C" u8 const mCcDObjData__8daNpcT_c[48]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; @@ -255,7 +99,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" void __register_global_object(); // @@ -281,25 +124,30 @@ SECTION_DATA u8 daObj_Nougu_c::mCcDSph[64] = { SECTION_DATA static void* l_resName = (void*)&d_a_obj_nougu__stringBase0; /* 80CA4A44-80CA4A64 -00001 0020+00 1/0 0/0 0/0 .data daObj_Nougu_MethodTable */ -SECTION_DATA static void* daObj_Nougu_MethodTable[8] = { - (void*)daObj_Nougu_Create__FPv, - (void*)daObj_Nougu_Delete__FPv, - (void*)daObj_Nougu_Execute__FPv, - (void*)daObj_Nougu_IsDelete__FPv, - (void*)daObj_Nougu_Draw__FPv, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObj_Nougu_MethodTable = { + (process_method_func)daObj_Nougu_Create__FPv, + (process_method_func)daObj_Nougu_Delete__FPv, + (process_method_func)daObj_Nougu_Execute__FPv, + (process_method_func)daObj_Nougu_IsDelete__FPv, + (process_method_func)daObj_Nougu_Draw__FPv, }; /* 80CA4A64-80CA4A94 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_NOUGU */ -SECTION_DATA extern void* g_profile_OBJ_NOUGU[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x012F0000, (void*)&g_fpcLf_Method, - (void*)0x00000E30, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00540000, (void*)&daObj_Nougu_MethodTable, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_NOUGU = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_NOUGU, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObj_Nougu_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 84, // mPriority + &daObj_Nougu_MethodTable, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CA4A94-80CA4AA0 000094 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */ @@ -371,7 +219,8 @@ asm daObj_Nougu_c::~daObj_Nougu_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Sph::~dCcD_Sph() { +// asm dCcD_Sph::~dCcD_Sph() { +extern "C" asm void __dt__8dCcD_SphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu/__dt__8dCcD_SphFv.s" } @@ -447,7 +296,8 @@ asm void daObj_Nougu_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Sph::dCcD_Sph() { +// asm dCcD_Sph::dCcD_Sph() { +extern "C" asm void __ct__8dCcD_SphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu/__ct__8dCcD_SphFv.s" } @@ -457,7 +307,8 @@ asm dCcD_Sph::dCcD_Sph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { +// asm cM3dGSph::~cM3dGSph() { +extern "C" asm void __dt__8cM3dGSphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu/__dt__8cM3dGSphFv.s" } @@ -467,7 +318,8 @@ asm cM3dGSph::~cM3dGSph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu/__dt__8cM3dGAabFv.s" } @@ -477,7 +329,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu/__dt__12dBgS_AcchCirFv.s" } @@ -487,7 +340,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu/__dt__10dCcD_GSttsFv.s" } @@ -497,7 +351,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu/__dt__12dBgS_ObjAcchFv.s" } @@ -696,7 +551,8 @@ static bool daObj_Nougu_IsDelete(void* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_octhashi/d_a_obj_octhashi.cpp b/rel/d/a/obj/d_a_obj_octhashi/d_a_obj_octhashi.cpp index d31b6d24795..ee303ebcbd1 100644 --- a/rel/d/a/obj/d_a_obj_octhashi/d_a_obj_octhashi.cpp +++ b/rel/d/a/obj/d_a_obj_octhashi/d_a_obj_octhashi.cpp @@ -1,127 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_octhashi -// +/** + * @file d_a_obj_octhashi.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_octhashi/d_a_obj_octhashi.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); - /* 80CA624C */ csXyz(); - /* 8026745C */ void operator+=(csXyz&); - /* 80CA546C */ ~csXyz(); -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static f32 mGroundY; -}; - -struct daObjOCTHASHI_c { - /* 80CA4BB8 */ void initCcCylinder(); - /* 80CA4DFC */ void SetCoSph(); - /* 80CA4EA4 */ void SetCoCyl(); - /* 80CA4F24 */ void HakaiSet2(int); - /* 80CA52F0 */ void HakaiMotion2(); - /* 80CA54E4 */ void CylAction(); - /* 80CA55C4 */ void SphAction(); - /* 80CA5844 */ void SphAction2(); - /* 80CA58F4 */ void Action(); - /* 80CA59BC */ void setBaseMtx(); - /* 80CA5AE0 */ void CreateHeap(); - /* 80CA5B98 */ void create(); - /* 80CA62A4 */ void Create(); - /* 80CA62F8 */ void Execute(f32 (**)[3][4]); - /* 80CA636C */ void Draw(); - /* 80CA6444 */ void Delete(); -}; - -struct dSv_memBit_c { - /* 80034934 */ void isDungeonItem(int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C6B8 */ void getObjectResName2Index(char const*, char const*); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dBgW_Base {}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; - -struct J3DModel {}; // // Forward References: @@ -223,8 +108,6 @@ extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __ct__10Z2CreatureFv(); extern "C" void init__10Z2CreatureFP3VecP3VecUcUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void __construct_array(); extern "C" void _savegpr_20(); extern "C" void _savegpr_21(); @@ -238,8 +121,6 @@ extern "C" void _restgpr_24(); extern "C" void _restgpr_25(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -249,8 +130,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_80CA6680[4]; @@ -474,7 +353,8 @@ asm void daObjOCTHASHI_c::HakaiMotion2() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm csXyz::~csXyz() { +// asm csXyz::~csXyz() { +extern "C" asm void __dt__5csXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_octhashi/d_a_obj_octhashi/__dt__5csXyzFv.s" } @@ -723,25 +603,30 @@ SECTION_DEAD static char const* const stringBase_80CA6572 = "S_octhashi00.dzb"; #pragma pop /* 80CA65CC-80CA65EC -00001 0020+00 1/0 0/0 0/0 .data l_daObjOCTHASHI_Method */ -SECTION_DATA static void* l_daObjOCTHASHI_Method[8] = { - (void*)daObjOCTHASHI_Create__FP10fopAc_ac_c, - (void*)daObjOCTHASHI_Delete__FP15daObjOCTHASHI_c, - (void*)daObjOCTHASHI_Execute__FP15daObjOCTHASHI_c, - (void*)daObjOCTHASHI_IsDelete__FP15daObjOCTHASHI_c, - (void*)daObjOCTHASHI_Draw__FP15daObjOCTHASHI_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjOCTHASHI_Method = { + (process_method_func)daObjOCTHASHI_Create__FP10fopAc_ac_c, + (process_method_func)daObjOCTHASHI_Delete__FP15daObjOCTHASHI_c, + (process_method_func)daObjOCTHASHI_Execute__FP15daObjOCTHASHI_c, + (process_method_func)daObjOCTHASHI_IsDelete__FP15daObjOCTHASHI_c, + (process_method_func)daObjOCTHASHI_Draw__FP15daObjOCTHASHI_c, }; /* 80CA65EC-80CA661C -00001 0030+00 0/0 0/0 1/0 .data g_profile_OCTHASHI */ -SECTION_DATA extern void* g_profile_OCTHASHI[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x006D0000, (void*)&g_fpcLf_Method, - (void*)0x000014B0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01D10000, (void*)&l_daObjOCTHASHI_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OCTHASHI = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OCTHASHI, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjOCTHASHI_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 465, // mPriority + &l_daObjOCTHASHI_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CA661C-80CA6628 000098 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -892,7 +777,8 @@ extern "C" asm void __dt__10dCcD_GSttsFv() { #pragma pop /* 80CA624C-80CA6250 00170C 0004+00 1/1 0/0 0/0 .text __ct__5csXyzFv */ -csXyz::csXyz() { +// csXyz::csXyz() { +extern "C" asm void __ct__5csXyzFv() { /* empty function */ } diff --git a/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.cpp b/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.cpp index 272f15a0b3e..572ee6a380b 100644 --- a/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.cpp +++ b/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.cpp @@ -1,205 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_onsenTaru -// +/** + * @file d_a_obj_onsenTaru.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80CA8678 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct fOpAcm_HIO_entry_c { - /* 80CA861C */ ~fOpAcm_HIO_entry_c(); -}; - -struct daOnsTaru_c { - /* 80CA86C0 */ void setBaseMtx(); - /* 80CA8748 */ void CreateHeap(); - /* 80CA87B4 */ void create(); - /* 80CA8C20 */ void createHeapCallBack(fopAc_ac_c*); - /* 80CA8C4C */ void chkSinkAll(); - /* 80CA8C70 */ void chkWaterLineIn(); - /* 80CA8C94 */ void bgCheck(); - /* 80CA8F38 */ void Execute(); - /* 80CA9184 */ void mode_proc_call(); - /* 80CA929C */ void mode_init_wait(); - /* 80CA92CC */ void mode_proc_wait(); - /* 80CA92F0 */ void mode_init_carry(); - /* 80CA9320 */ void mode_proc_carry(); - /* 80CA93C0 */ void mode_init_drop(); - /* 80CA9400 */ void mode_proc_drop(); - /* 80CA9424 */ void mode_init_break(); - /* 80CA9514 */ void mode_proc_break(); - /* 80CA9518 */ void mode_init_sink(); - /* 80CA9530 */ void mode_proc_sink(); - /* 80CA9620 */ void breakEffSet(); - /* 80CA98B8 */ void Draw(); - /* 80CA995C */ void Delete(); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; -}; - -struct daOnsTaru_HIO_c { - /* 80CA85CC */ daOnsTaru_HIO_c(); - /* 80CA9A78 */ ~daOnsTaru_HIO_c(); -}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct JPABaseEmitter {}; - -struct dPa_modelEcallBack { - /* 8004AC00 */ void setModel(JPABaseEmitter*, J3DModelData*, dKy_tevstr_c const&, u8, void*, u8, - u8); - - static u8 mEcallback[4]; -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); - /* 80CA8AE4 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800842C0 */ void ChkAtHit(); - /* 800843A8 */ void GetAtHitGObj(); - /* 80084460 */ void ChkTgHit(); - /* 80084548 */ void GetTgHitGObj(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80CA8BB0 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80CA8B40 */ ~dBgS_AcchCir(); -}; - -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80CA8A54 */ ~cM3dGCyl(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 80CA8A9C */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80CA9A30 */ ~cCcD_GStts(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; -struct J3DModel {}; // // Forward References: @@ -302,8 +109,6 @@ extern "C" void SetR__8cM3dGCylFf(); extern "C" void cLib_addCalc__FPfffff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_27(); extern "C" void _savegpr_28(); @@ -311,8 +116,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -320,8 +123,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mEcallback__18dPa_modelEcallBack[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -428,25 +229,30 @@ SECTION_DATA static u8 l_mode_func[60] = { #pragma pop /* 80CA9CF4-80CA9D14 -00001 0020+00 1/0 0/0 0/0 .data l_daOnsTaru_Method */ -SECTION_DATA static void* l_daOnsTaru_Method[8] = { - (void*)daOnsTaru_Create__FP10fopAc_ac_c, - (void*)daOnsTaru_Delete__FP11daOnsTaru_c, - (void*)daOnsTaru_Execute__FP11daOnsTaru_c, - (void*)NULL, - (void*)daOnsTaru_Draw__FP11daOnsTaru_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daOnsTaru_Method = { + (process_method_func)daOnsTaru_Create__FP10fopAc_ac_c, + (process_method_func)daOnsTaru_Delete__FP11daOnsTaru_c, + (process_method_func)daOnsTaru_Execute__FP11daOnsTaru_c, + 0, + (process_method_func)daOnsTaru_Draw__FP11daOnsTaru_c, }; /* 80CA9D14-80CA9D44 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_OnsenTaru */ -SECTION_DATA extern void* g_profile_Obj_OnsenTaru[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x016C0000, (void*)&g_fpcLf_Method, - (void*)0x00000948, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01FE0000, (void*)&l_daOnsTaru_Method, - (void*)0x00040020, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_OnsenTaru = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_OnsenTaru, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daOnsTaru_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 510, // mPriority + &l_daOnsTaru_Method, // sub_method + 0x00040020, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CA9D44-80CA9D50 00012C 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ @@ -542,7 +348,8 @@ asm daOnsTaru_HIO_c::daOnsTaru_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { +// asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { +extern "C" asm void __dt__18fOpAcm_HIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__18fOpAcm_HIO_entry_cFv.s" } @@ -552,7 +359,8 @@ asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__14mDoHIO_entry_cFv.s" } @@ -633,7 +441,8 @@ asm void daOnsTaru_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__8cM3dGCylFv.s" } @@ -643,7 +452,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__8cM3dGAabFv.s" } @@ -653,7 +463,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__10dCcD_GSttsFv.s" } @@ -663,7 +474,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__12dBgS_AcchCirFv.s" } @@ -673,7 +485,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__12dBgS_ObjAcchFv.s" } @@ -1019,7 +832,8 @@ static asm void daOnsTaru_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_ornament_cloth/d_a_obj_ornament_cloth.cpp b/rel/d/a/obj/d_a_obj_ornament_cloth/d_a_obj_ornament_cloth.cpp index 3c454d69479..91d3fb0d250 100644 --- a/rel/d/a/obj/d_a_obj_ornament_cloth/d_a_obj_ornament_cloth.cpp +++ b/rel/d/a/obj/d_a_obj_ornament_cloth/d_a_obj_ornament_cloth.cpp @@ -1,96 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_ornament_cloth -// +/** + * @file d_a_obj_ornament_cloth.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_ornament_cloth/d_a_obj_ornament_cloth.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct Vec {}; - -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266B84 */ void operator*(f32) const; - /* 80266F48 */ void normalizeZP(); -}; - -struct mDoMtx_stack_c { - /* 8000CCC8 */ void push(); - /* 8000CD14 */ void pop(); - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjOnCloth_c { - /* 80595038 */ void create_init(); - /* 80595158 */ void initBaseMtx(); - /* 80595178 */ void setBaseMtx(); - /* 805951DC */ void setNormalClothPos(); - /* 805954B0 */ void calcJointAngle(); - /* 80595638 */ void checkPlayerMove(); - - static u8 const M_attr[48]; -}; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DSys { - static u8 mCurrentMtx[48]; -}; - -struct J3DModel {}; - -struct J3DJoint {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 805959E8 */ ~J3DFrameCtrl(); -}; - -struct ClothJoint_c { - /* 80595B9C */ ~ClothJoint_c(); - /* 80595CA8 */ ClothJoint_c(); -}; // // Forward References: @@ -149,12 +65,6 @@ extern "C" void cM_rnd__Fv(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXInverse(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); -extern "C" void PSVECScale(); -extern "C" void PSVECSquareMag(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void _savegpr_22(); @@ -165,15 +75,10 @@ extern "C" void _restgpr_22(); extern "C" void _restgpr_25(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; // // Declarations: @@ -390,25 +295,30 @@ SECTION_DEAD static char const* const stringBase_80595D50 = "J_Necktie.btk"; SECTION_DATA static void* l_arcName = (void*)&d_a_obj_ornament_cloth__stringBase0; /* 80595D64-80595D84 -00001 0020+00 1/0 0/0 0/0 .data l_daObjOnCloth_Method */ -SECTION_DATA static void* l_daObjOnCloth_Method[8] = { - (void*)daObjOnCloth_Create__FP10fopAc_ac_c, - (void*)daObjOnCloth_Delete__FP14daObjOnCloth_c, - (void*)daObjOnCloth_Execute__FP14daObjOnCloth_c, - (void*)daObjOnCloth_IsDelete__FP14daObjOnCloth_c, - (void*)daObjOnCloth_Draw__FP14daObjOnCloth_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjOnCloth_Method = { + (process_method_func)daObjOnCloth_Create__FP10fopAc_ac_c, + (process_method_func)daObjOnCloth_Delete__FP14daObjOnCloth_c, + (process_method_func)daObjOnCloth_Execute__FP14daObjOnCloth_c, + (process_method_func)daObjOnCloth_IsDelete__FP14daObjOnCloth_c, + (process_method_func)daObjOnCloth_Draw__FP14daObjOnCloth_c, }; /* 80595D84-80595DB4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_OnCloth */ -SECTION_DATA extern void* g_profile_Obj_OnCloth[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01510000, (void*)&g_fpcLf_Method, - (void*)0x000006C8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00210000, (void*)&l_daObjOnCloth_Method, - (void*)0x00040180, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_OnCloth = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_OnCloth, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjOnCloth_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 33, // mPriority + &l_daObjOnCloth_Method, // sub_method + 0x00040180, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80595DB4-80595DC0 000054 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ @@ -432,7 +342,8 @@ static asm void createSolidHeap(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ornament_cloth/d_a_obj_ornament_cloth/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_pdoor/d_a_obj_pdoor.cpp b/rel/d/a/obj/d_a_obj_pdoor/d_a_obj_pdoor.cpp index f1a596c3193..a8734229ef6 100644 --- a/rel/d/a/obj/d_a_obj_pdoor/d_a_obj_pdoor.cpp +++ b/rel/d/a/obj/d_a_obj_pdoor/d_a_obj_pdoor.cpp @@ -1,111 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_pdoor -// +/** + * @file d_a_obj_pdoor.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_pdoor/d_a_obj_pdoor.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjPDoor_c { - /* 80CA9F9C */ void initBaseMtx(); - /* 80CA9FD8 */ void setBaseMtx(); - /* 80CAA03C */ void Create(); - /* 80CAA14C */ void CreateHeap(); - /* 80CAA1BC */ void create1st(); - /* 80CAA23C */ void Execute(f32 (**)[3][4]); - /* 80CAA290 */ void mode_proc_call(); - /* 80CAA31C */ void init_modeWait(); - /* 80CAA354 */ void modeWait(); - /* 80CAA698 */ void init_modeRotate(); - /* 80CAA6B4 */ void modeRotate(); - /* 80CAA968 */ void Draw(); - /* 80CAAA0C */ void Delete(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 800352B0 */ void offSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW_Base { - struct PushPullLabel {}; -}; - -struct dBgW {}; -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -164,19 +65,13 @@ extern "C" void cLib_addCalcAngleS__FPsssss(); extern "C" void cLib_addCalcAngleS2__FPssss(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_80CAAC30[4]; @@ -445,25 +340,30 @@ asm void daObjPDoor_c::Delete() { /* ############################################################################################## */ /* 80CAABB8-80CAABD8 -00001 0020+00 1/0 0/0 0/0 .data daObjPDoor_METHODS */ -SECTION_DATA static void* daObjPDoor_METHODS[8] = { - (void*)daObjPDoor_create1st__FP12daObjPDoor_c, - (void*)daObjPDoor_MoveBGDelete__FP12daObjPDoor_c, - (void*)daObjPDoor_MoveBGExecute__FP12daObjPDoor_c, - (void*)NULL, - (void*)daObjPDoor_MoveBGDraw__FP12daObjPDoor_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjPDoor_METHODS = { + (process_method_func)daObjPDoor_create1st__FP12daObjPDoor_c, + (process_method_func)daObjPDoor_MoveBGDelete__FP12daObjPDoor_c, + (process_method_func)daObjPDoor_MoveBGExecute__FP12daObjPDoor_c, + 0, + (process_method_func)daObjPDoor_MoveBGDraw__FP12daObjPDoor_c, }; /* 80CAABD8-80CAAC08 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_PushDoor */ -SECTION_DATA extern void* g_profile_Obj_PushDoor[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00BE0000, (void*)&g_fpcLf_Method, - (void*)0x000005C4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02410000, (void*)&daObjPDoor_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_PushDoor = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_PushDoor, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjPDoor_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 577, // mPriority + &daObjPDoor_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CAAC08-80CAAC30 0000BC 0028+00 1/1 0/0 0/0 .data __vt__12daObjPDoor_c */ diff --git a/rel/d/a/obj/d_a_obj_pdtile/d_a_obj_pdtile.cpp b/rel/d/a/obj/d_a_obj_pdtile/d_a_obj_pdtile.cpp index 789bcfab3d6..7ea5a45a553 100644 --- a/rel/d/a/obj/d_a_obj_pdtile/d_a_obj_pdtile.cpp +++ b/rel/d/a/obj/d_a_obj_pdtile/d_a_obj_pdtile.cpp @@ -1,120 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_pdtile -// +/** + * @file d_a_obj_pdtile.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_pdtile/d_a_obj_pdtile.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CE70 */ void scaleM(cXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjPDtile_c { - /* 80CAACE0 */ void create1st(); - /* 80CAAE80 */ void setMtx(); - /* 80CAAF90 */ void rideActor(fopAc_ac_c*); - /* 80CAB1F0 */ void CreateHeap(); - /* 80CAB258 */ void Create(); - /* 80CAB374 */ void Execute(f32 (**)[3][4]); - /* 80CABF50 */ void Draw(); - /* 80CAC094 */ void Delete(); - /* 80CAC374 */ ~daObjPDtile_c(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW_Base {}; - -struct dBgW {}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjGndChk { - /* 80CABED8 */ ~dBgS_ObjGndChk(); -}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); - /* 800744A0 */ void GroundCross(cBgS_GndChk*); -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDF48 */ ~Z2SoundObjBase(); - /* 802BDFF8 */ void deleteObject(); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -193,8 +85,6 @@ extern "C" void __dt__14Z2SoundObjBaseFv(); extern "C" void deleteObject__14Z2SoundObjBaseFv(); extern "C" void __ct__16Z2SoundObjSimpleFv(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __cvt_fp2unsigned(); extern "C" void _savegpr_25(); extern "C" void _savegpr_28(); @@ -202,8 +92,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_25(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -213,8 +101,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" extern void* __vt__16Z2SoundObjSimple[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -597,25 +483,30 @@ COMPILER_STRIP_GATE(0x80CAC574, &lit_4202); #pragma pop /* 80CAC68C-80CAC6AC -00001 0020+00 1/0 0/0 0/0 .data daObjPDtile_METHODS */ -SECTION_DATA static void* daObjPDtile_METHODS[8] = { - (void*)daObjPDtile_create1st__FP13daObjPDtile_c, - (void*)daObjPDtile_MoveBGDelete__FP13daObjPDtile_c, - (void*)daObjPDtile_MoveBGExecute__FP13daObjPDtile_c, - (void*)NULL, - (void*)daObjPDtile_MoveBGDraw__FP13daObjPDtile_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjPDtile_METHODS = { + (process_method_func)daObjPDtile_create1st__FP13daObjPDtile_c, + (process_method_func)daObjPDtile_MoveBGDelete__FP13daObjPDtile_c, + (process_method_func)daObjPDtile_MoveBGExecute__FP13daObjPDtile_c, + 0, + (process_method_func)daObjPDtile_MoveBGDraw__FP13daObjPDtile_c, }; /* 80CAC6AC-80CAC6DC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_PDtile */ -SECTION_DATA extern void* g_profile_Obj_PDtile[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00CE0000, (void*)&g_fpcLf_Method, - (void*)0x000007FC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x029E0000, (void*)&daObjPDtile_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_PDtile = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_PDtile, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjPDtile_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 670, // mPriority + &daObjPDtile_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CAC6DC-80CAC6E8 000140 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -677,7 +568,8 @@ asm void daObjPDtile_c::Execute(f32 (**param_0)[3][4]) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +// asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +extern "C" asm void __dt__14dBgS_ObjGndChkFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_pdtile/d_a_obj_pdtile/__dt__14dBgS_ObjGndChkFv.s" } diff --git a/rel/d/a/obj/d_a_obj_pdwall/d_a_obj_pdwall.cpp b/rel/d/a/obj/d_a_obj_pdwall/d_a_obj_pdwall.cpp index daa6837afb0..4e75ef4f388 100644 --- a/rel/d/a/obj/d_a_obj_pdwall/d_a_obj_pdwall.cpp +++ b/rel/d/a/obj/d_a_obj_pdwall/d_a_obj_pdwall.cpp @@ -1,118 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_pdwall -// +/** + * @file d_a_obj_pdwall.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_pdwall/d_a_obj_pdwall.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjPDwall_c { - /* 80CAC7F8 */ void create1st(); - /* 80CAC8DC */ void setMtx(); - /* 80CACA44 */ void CreateHeap(); - /* 80CACBA8 */ void Create(); - /* 80CACCE0 */ void Execute(f32 (**)[3][4]); - /* 80CACF14 */ void Draw(); - /* 80CACFD4 */ void Delete(); - /* 80CAD140 */ ~daObjPDwall_c(); -}; - -struct cXyz {}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -167,8 +60,6 @@ extern "C" void ChkUsed__9cBgW_BgIdCFv(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void _savegpr_24(); extern "C" void _savegpr_25(); extern "C" void _savegpr_26(); @@ -177,13 +68,9 @@ extern "C" void _restgpr_24(); extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // @@ -337,25 +224,30 @@ asm void daObjPDwall_c::Delete() { /* ############################################################################################## */ /* 80CAD200-80CAD220 -00001 0020+00 1/0 0/0 0/0 .data daObjPDwall_METHODS */ -SECTION_DATA static void* daObjPDwall_METHODS[8] = { - (void*)daObjPDwall_create1st__FP13daObjPDwall_c, - (void*)daObjPDwall_MoveBGDelete__FP13daObjPDwall_c, - (void*)daObjPDwall_MoveBGExecute__FP13daObjPDwall_c, - (void*)NULL, - (void*)daObjPDwall_MoveBGDraw__FP13daObjPDwall_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjPDwall_METHODS = { + (process_method_func)daObjPDwall_create1st__FP13daObjPDwall_c, + (process_method_func)daObjPDwall_MoveBGDelete__FP13daObjPDwall_c, + (process_method_func)daObjPDwall_MoveBGExecute__FP13daObjPDwall_c, + 0, + (process_method_func)daObjPDwall_MoveBGDraw__FP13daObjPDwall_c, }; /* 80CAD220-80CAD250 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_PDwall */ -SECTION_DATA extern void* g_profile_Obj_PDwall[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00CF0000, (void*)&g_fpcLf_Method, - (void*)0x00000A18, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x029F0000, (void*)&daObjPDwall_METHODS, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_PDwall = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_PDwall, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjPDwall_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 671, // mPriority + &daObjPDwall_METHODS, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CAD250-80CAD27C 000054 002C+00 2/2 0/0 0/0 .data __vt__13daObjPDwall_c */ diff --git a/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture.cpp b/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture.cpp index 085bf57d35e..5a3cb44bd9a 100644 --- a/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture.cpp +++ b/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture.cpp @@ -1,206 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_picture -// +/** + * @file d_a_obj_picture.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_picture/d_a_obj_picture.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct Vec {}; - -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266B84 */ void operator*(f32) const; - /* 80266F48 */ void normalizeZP(); -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CE38 */ void scaleM(f32, f32, f32); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct mDoExt_3DlineMat_c {}; - -struct mDoExt_3DlineMatSortPacket { - /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); -}; - -struct ResTIMG {}; - -struct _GXColor {}; - -struct dKy_tevstr_c {}; - -struct mDoExt_3DlineMat1_c { - /* 80013360 */ void init(u16, u16, ResTIMG*, int); - /* 8001373C */ void update(int, f32, _GXColor&, u16, dKy_tevstr_c*); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static f32 mGroundY; -}; - -struct daObjPicture_c { - /* 80CAD318 */ daObjPicture_c(); - /* 80CAD6C8 */ ~daObjPicture_c(); - /* 80CAD908 */ void createHeap(); - /* 80CADC18 */ void create(); - /* 80CADFB0 */ void Delete(); - /* 80CAE05C */ void draw(); - /* 80CAE1B8 */ void execute(); - /* 80CAE510 */ void init(); - /* 80CAE5B0 */ void setPicModelMtx(); - /* 80CAE638 */ void setTmgModelMtx(); - /* 80CAE6C4 */ void getLinePosPic(int, cXyz*); - /* 80CAE744 */ void getPosTmg(cXyz*); - /* 80CAE76C */ void setLinePos(); - /* 80CAE8E8 */ void moveLineFall1(); - /* 80CAEA60 */ void moveLineFall2(); - /* 80CAED28 */ void chkHitRope(); - /* 80CAEDDC */ void chkHitBombTg(); - /* 80CAEE90 */ void setPicAtCol(); - - static u8 s_CcDCps[76]; - static u8 s_CcDCyl_pic_at[68]; -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_SrcCps {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80CAD66C */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 800844F8 */ void GetTgHitObj(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct dCcD_Cps { - /* 800847D0 */ void Set(dCcD_SrcCps const&); - /* 80084854 */ void CalcTgVec(); - /* 80CAD528 */ ~dCcD_Cps(); - /* 80CAD5EC */ dCcD_Cps(); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80CAD498 */ ~cM3dGCyl(); -}; - -struct cM3dGCps { - /* 8026EF88 */ cM3dGCps(); - /* 8026EFA4 */ ~cM3dGCps(); - /* 8026F000 */ void Set(cXyz const&, cXyz const&, f32); -}; - -struct cM3dGAab { - /* 80CAD4E0 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80CAEFCC */ ~cCcD_GStts(); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS_PolyInfo {}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -243,7 +48,6 @@ extern "C" u8 s_CcDCyl_pic_at__14daObjPicture_c[68]; // External References: // -SECTION_INIT void memset(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void scaleM__14mDoMtx_stack_cFfff(); @@ -299,10 +103,6 @@ extern "C" void cLib_chaseF__FPfff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECSquareDistance(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void _savegpr_19(); @@ -318,8 +118,6 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__8dCcD_Cps[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -329,10 +127,7 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -391,25 +186,30 @@ SECTION_DATA u8 daObjPicture_c::s_CcDCyl_pic_at[68] = { }; /* 80CAF1A0-80CAF1C0 -00001 0020+00 1/0 0/0 0/0 .data daObjPicture_METHODS */ -SECTION_DATA static void* daObjPicture_METHODS[8] = { - (void*)daObjPicture_create__FP14daObjPicture_c, - (void*)daObjPicture_Delete__FP14daObjPicture_c, - (void*)daObjPicture_execute__FP14daObjPicture_c, - (void*)NULL, - (void*)daObjPicture_draw__FP14daObjPicture_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjPicture_METHODS = { + (process_method_func)daObjPicture_create__FP14daObjPicture_c, + (process_method_func)daObjPicture_Delete__FP14daObjPicture_c, + (process_method_func)daObjPicture_execute__FP14daObjPicture_c, + 0, + (process_method_func)daObjPicture_draw__FP14daObjPicture_c, }; /* 80CAF1C0-80CAF1F0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Picture */ -SECTION_DATA extern void* g_profile_Obj_Picture[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x019E0000, (void*)&g_fpcLf_Method, - (void*)0x00000DA0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02E60000, (void*)&daObjPicture_METHODS, - (void*)0x00040180, (void*)0x030E0000, +extern actor_process_profile_definition g_profile_Obj_Picture = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Picture, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjPicture_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 742, // mPriority + &daObjPicture_METHODS, // sub_method + 0x00040180, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CAF1F0-80CAF204 000108 0014+00 1/1 0/0 0/0 .data __vt__18mDoExt_3DlineMat_c */ @@ -466,7 +266,8 @@ asm daObjPicture_c::daObjPicture_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture/__dt__8cM3dGCylFv.s" } @@ -476,7 +277,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture/__dt__8cM3dGAabFv.s" } @@ -486,7 +288,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Cps::~dCcD_Cps() { +// asm dCcD_Cps::~dCcD_Cps() { +extern "C" asm void __dt__8dCcD_CpsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture/__dt__8dCcD_CpsFv.s" } @@ -496,7 +299,8 @@ asm dCcD_Cps::~dCcD_Cps() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Cps::dCcD_Cps() { +// asm dCcD_Cps::dCcD_Cps() { +extern "C" asm void __ct__8dCcD_CpsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture/__ct__8dCcD_CpsFv.s" } @@ -506,7 +310,8 @@ asm dCcD_Cps::dCcD_Cps() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture/__dt__10dCcD_GSttsFv.s" } @@ -1013,7 +818,8 @@ static asm void daObjPicture_draw(daObjPicture_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_pillar/d_a_obj_pillar.cpp b/rel/d/a/obj/d_a_obj_pillar/d_a_obj_pillar.cpp index 77d9d0bfc89..0d105b0c1d0 100644 --- a/rel/d/a/obj/d_a_obj_pillar/d_a_obj_pillar.cpp +++ b/rel/d/a/obj/d_a_obj_pillar/d_a_obj_pillar.cpp @@ -1,109 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_pillar -// +/** + * @file d_a_obj_pillar.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_pillar/d_a_obj_pillar.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80CAF3B0 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct daPillar_c { - /* 80CAF4B4 */ void setBaseMtx(); - /* 80CAF5EC */ void Create(); - /* 80CAF7A8 */ void CreateHeap(); - /* 80CAF8A4 */ void create1st(); - /* 80CAFB44 */ void checkAttacked(); - /* 80CAFC08 */ void on_switch(); - /* 80CAFD64 */ void checkShake(); - /* 80CAFF60 */ void setShake_rcrash(); - /* 80CB01E0 */ void setShake_strong(); - /* 80CB022C */ void setShake_weak(); - /* 80CB0278 */ void switch_proc_call(); - /* 80CB031C */ void actionSwOnWait(); - /* 80CB0378 */ void actionSwOn(); - /* 80CB03CC */ void actionEnd(); - /* 80CB03D0 */ void Execute(f32 (**)[3][4]); - /* 80CB0658 */ void Draw(); - /* 80CB0740 */ void Delete(); -}; - -struct daPillar_HIO_c { - /* 80CAF32C */ daPillar_HIO_c(); - /* 80CB0928 */ ~daPillar_HIO_c(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); - /* 8006FB10 */ void StartQuake(int, int, cXyz); - /* 8006FD94 */ void StopQuake(int); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -185,8 +89,6 @@ extern "C" void SetC__8cM3dGCylFRC4cXyz(); extern "C" void cLib_addCalcAngleS__FPsssss(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_26(); extern "C" void _savegpr_27(); @@ -196,8 +98,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -205,8 +105,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -354,25 +252,30 @@ SECTION_DATA static u8 l_func[36] = { #pragma pop /* 80CB0B58-80CB0B78 -00001 0020+00 1/0 0/0 0/0 .data daPillar_METHODS */ -SECTION_DATA static void* daPillar_METHODS[8] = { - (void*)daPillar_create1st__FP10daPillar_c, - (void*)daPillar_MoveBGDelete__FP10daPillar_c, - (void*)daPillar_MoveBGExecute__FP10daPillar_c, - (void*)NULL, - (void*)daPillar_MoveBGDraw__FP10daPillar_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daPillar_METHODS = { + (process_method_func)daPillar_create1st__FP10daPillar_c, + (process_method_func)daPillar_MoveBGDelete__FP10daPillar_c, + (process_method_func)daPillar_MoveBGExecute__FP10daPillar_c, + 0, + (process_method_func)daPillar_MoveBGDraw__FP10daPillar_c, }; /* 80CB0B78-80CB0BA8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Pillar */ -SECTION_DATA extern void* g_profile_Obj_Pillar[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00330000, (void*)&g_fpcLf_Method, - (void*)0x00000750, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01B00000, (void*)&daPillar_METHODS, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Pillar = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Pillar, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daPillar_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 432, // mPriority + &daPillar_METHODS, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CB0BA8-80CB0BB4 0000C0 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -445,7 +348,8 @@ asm daPillar_HIO_c::daPillar_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_pillar/d_a_obj_pillar/__dt__14mDoHIO_entry_cFv.s" } diff --git a/rel/d/a/obj/d_a_obj_poCandle/d_a_obj_poCandle.cpp b/rel/d/a/obj/d_a_obj_poCandle/d_a_obj_poCandle.cpp index 69b74467fde..8a8d7260ae3 100644 --- a/rel/d/a/obj/d_a_obj_poCandle/d_a_obj_poCandle.cpp +++ b/rel/d/a/obj/d_a_obj_poCandle/d_a_obj_poCandle.cpp @@ -1,135 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_poCandle -// +/** + * @file d_a_obj_poCandle.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_poCandle/d_a_obj_poCandle.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80CB1A9C */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daPoCandle_c { - /* 80CB1AE4 */ void setBaseMtx(); - /* 80CB1B6C */ void CreateHeap(); - /* 80CB1BD8 */ void create(); - /* 80CB1D74 */ void lightInit(); - /* 80CB1E00 */ void setLight(); - /* 80CB1E30 */ void cutLight(); - /* 80CB1E60 */ void pointLightProc(); - /* 80CB1F10 */ void Execute(f32 (**)[3][4]); - /* 80CB2140 */ void init_modeWait(); - /* 80CB214C */ void modeWait(); - /* 80CB21D8 */ void init_modeOnFire(); - /* 80CB22D4 */ void modeOnFire(); - /* 80CB22F4 */ void modeOnSwWait(); - /* 80CB2354 */ void init_modeEnd(); - /* 80CB2360 */ void modeEnd(); - /* 80CB2364 */ void eventStart(); - /* 80CB2388 */ void Draw(); - /* 80CB242C */ void Delete(); - /* 80CB2610 */ ~daPoCandle_c(); -}; - -struct daPoCandle_HIO_c { - /* 80CB1A6C */ daPoCandle_HIO_c(); - /* 80CB2508 */ ~daPoCandle_HIO_c(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dEvLib_callback_c { - /* 8004886C */ void eventUpdate(); - /* 80CB25B0 */ ~dEvLib_callback_c(); - /* 80CB25F8 */ bool eventStart(); - /* 80CB2600 */ bool eventRun(); - /* 80CB2608 */ bool eventEnd(); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct LIGHT_INFLUENCE {}; - -struct J3DModel {}; // // Forward References: @@ -209,18 +85,12 @@ extern "C" void cLib_addCalc__FPfffff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_28(); extern "C" void _restgpr_28(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -302,25 +172,30 @@ SECTION_DATA static u8 mode_proc[48] = { #pragma pop /* 80CB2770-80CB2790 -00001 0020+00 1/0 0/0 0/0 .data l_daPoCandle_Method */ -SECTION_DATA static void* l_daPoCandle_Method[8] = { - (void*)daPoCandle_Create__FP10fopAc_ac_c, - (void*)daPoCandle_Delete__FP12daPoCandle_c, - (void*)daPoCandle_Execute__FP12daPoCandle_c, - (void*)NULL, - (void*)daPoCandle_Draw__FP12daPoCandle_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daPoCandle_Method = { + (process_method_func)daPoCandle_Create__FP10fopAc_ac_c, + (process_method_func)daPoCandle_Delete__FP12daPoCandle_c, + (process_method_func)daPoCandle_Execute__FP12daPoCandle_c, + 0, + (process_method_func)daPoCandle_Draw__FP12daPoCandle_c, }; /* 80CB2790-80CB27C0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_poCandle */ -SECTION_DATA extern void* g_profile_Obj_poCandle[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00A80000, (void*)&g_fpcLf_Method, - (void*)0x00000614, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x028A0000, (void*)&l_daPoCandle_Method, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_poCandle = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_poCandle, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daPoCandle_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 650, // mPriority + &l_daPoCandle_Method, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CB27C0-80CB27D8 0000D0 0018+00 3/3 0/0 0/0 .data __vt__17dEvLib_callback_c */ @@ -383,7 +258,8 @@ asm daPoCandle_HIO_c::daPoCandle_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_poCandle/d_a_obj_poCandle/__dt__14mDoHIO_entry_cFv.s" } @@ -752,7 +628,8 @@ static asm void func_80CB25A8() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dEvLib_callback_c::~dEvLib_callback_c() { +// asm dEvLib_callback_c::~dEvLib_callback_c() { +extern "C" asm void __dt__17dEvLib_callback_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_poCandle/d_a_obj_poCandle/__dt__17dEvLib_callback_cFv.s" } @@ -760,17 +637,20 @@ asm dEvLib_callback_c::~dEvLib_callback_c() { /* 80CB25F8-80CB2600 000C78 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventStart() { +// bool dEvLib_callback_c::eventStart() { +extern "C" bool eventStart__17dEvLib_callback_cFv() { return true; } /* 80CB2600-80CB2608 000C80 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventRun() { +// bool dEvLib_callback_c::eventRun() { +extern "C" bool eventRun__17dEvLib_callback_cFv() { return true; } /* 80CB2608-80CB2610 000C88 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventEnd() { +// bool dEvLib_callback_c::eventEnd() { +extern "C" bool eventEnd__17dEvLib_callback_cFv() { return true; } diff --git a/rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.cpp b/rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.cpp index d840c19f244..554c74c2a12 100644 --- a/rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.cpp +++ b/rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.cpp @@ -1,156 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_poFire -// +/** + * @file d_a_obj_poFire.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80CB29C4 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daPoFire_c { - /* 80CB2A0C */ void setBaseMtx(); - /* 80CB2A74 */ void create(); - /* 80CB2BB8 */ void Execute(); - /* 80CB2BFC */ void procMain(); - /* 80CB2D84 */ void setFire(); - /* 80CB2F68 */ void searchCandle(void*, void*); - /* 80CB2FD4 */ void searchFireTag(void*, void*); - /* 80CB3024 */ void init_modeInitMove(); - /* 80CB30FC */ void modeInitMove(); - /* 80CB31FC */ void modeWait(); - /* 80CB32EC */ void init_modeWaitSetEffect(); - /* 80CB3380 */ void modeWaitSetEffect(); - /* 80CB3540 */ void init_modeMoveOut(); - /* 80CB355C */ void modeMoveOut(); - /* 80CB3714 */ void init_modeMove(); - /* 80CB3730 */ void modeMove(); - /* 80CB38EC */ void init_modeMoveWait(); - /* 80CB3918 */ void modeMoveWait(); - /* 80CB3958 */ void modeNoMove(); - /* 80CB39CC */ void init_modeOnFire(); - /* 80CB39E0 */ void modeOnFire(); - /* 80CB3ADC */ void init_modeFireEnd(); - /* 80CB3AE8 */ void modeFireEnd(); - /* 80CB3B70 */ void eventStart(); - /* 80CB3BE0 */ void eventRun(); - /* 80CB3C64 */ bool eventEnd(); - /* 80CB3C6C */ bool Draw(); - /* 80CB3C74 */ void Delete(); - /* 80CB3E58 */ ~daPoFire_c(); -}; - -struct daPoFire_HIO_c { - /* 80CB294C */ daPoFire_HIO_c(); - /* 80CB3D24 */ ~daPoFire_HIO_c(); -}; - -struct daPoCandle_c { - /* 80CB3E3C */ void getFirePos(); -}; - -struct dSv_player_get_item_c { - /* 80033E94 */ void offFirstBit(u8); -}; - -struct dPa_levelEcallBack {}; - -struct dKy_tevstr_c {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct Vec {}; - -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266B84 */ void operator*(f32) const; -}; - -struct dPa_control_c { - struct level_c { - /* 8004B8B4 */ void forceOnEventMove(u32); - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); - - static u8 mParticleTracePCB[4 + 4 /* padding */]; -}; - -struct dEvt_control_c { - /* 8004368C */ void setPtT(void*); -}; - -struct dEvent_manager_c { - /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int); - /* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int); - /* 8004817C */ void cutEnd(int); -}; - -struct dEvLib_callback_c { - /* 8004886C */ void eventUpdate(); - /* 80048940 */ void orderEvent(int, int, int); - /* 80CB3DDC */ ~dEvLib_callback_c(); - /* 80CB3E24 */ bool eventStart(); - /* 80CB3E2C */ bool eventRun(); - /* 80CB3E34 */ bool eventEnd(); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct dAttCatch_c { - /* 80073A08 */ void request(fopAc_ac_c*, u8, f32, f32, f32, s16, int); -}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; - -struct cBgS { - /* 800744A0 */ void GroundCross(cBgS_GndChk*); -}; - -struct JPABaseEmitter { - /* 8027EC60 */ void deleteAllParticle(); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct JGeometry { - template - struct TVec3 {}; - /* TVec3 */ - struct TVec3__template0 {}; -}; // // Forward References: @@ -242,15 +97,11 @@ extern "C" void cLib_addCalcPos__FP4cXyzRC4cXyzfff(); extern "C" void deleteAllParticle__14JPABaseEmitterFv(); extern "C" void func_802807E0(); extern "C" void __dl__FPv(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_26(); extern "C" void _savegpr_27(); extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 sincosTable___5JMath[65536]; @@ -442,25 +293,30 @@ SECTION_DATA static u8 mode_proc[108] = { SECTION_DATA static void* action_table = (void*)(((char*)&d_a_obj_poFire__stringBase0) + 0xE); /* 80CB4050-80CB4070 -00001 0020+00 1/0 0/0 0/0 .data l_daPoFire_Method */ -SECTION_DATA static void* l_daPoFire_Method[8] = { - (void*)daPoFire_Create__FP10fopAc_ac_c, - (void*)daPoFire_Delete__FP10daPoFire_c, - (void*)daPoFire_Execute__FP10daPoFire_c, - (void*)NULL, - (void*)daPoFire_Draw__FP10daPoFire_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daPoFire_Method = { + (process_method_func)daPoFire_Create__FP10fopAc_ac_c, + (process_method_func)daPoFire_Delete__FP10daPoFire_c, + (process_method_func)daPoFire_Execute__FP10daPoFire_c, + 0, + (process_method_func)daPoFire_Draw__FP10daPoFire_c, }; /* 80CB4070-80CB40A0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_poFire */ -SECTION_DATA extern void* g_profile_Obj_poFire[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01730000, (void*)&g_fpcLf_Method, - (void*)0x00000618, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x021C0000, (void*)&l_daPoFire_Method, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_poFire = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Tag_Lv4Candle, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daPoFire_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 540, // mPriority + &l_daPoFire_Method, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CB40A0-80CB40D0 00014C 0030+00 2/2 0/0 0/0 .data __vt__10daPoFire_c */ @@ -517,7 +373,8 @@ asm daPoFire_HIO_c::daPoFire_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire/__dt__14mDoHIO_entry_cFv.s" } @@ -1006,7 +863,8 @@ static asm void func_80CB3DD4() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dEvLib_callback_c::~dEvLib_callback_c() { +// asm dEvLib_callback_c::~dEvLib_callback_c() { +extern "C" asm void __dt__17dEvLib_callback_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire/__dt__17dEvLib_callback_cFv.s" } @@ -1014,17 +872,20 @@ asm dEvLib_callback_c::~dEvLib_callback_c() { /* 80CB3E24-80CB3E2C 0015C4 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventStart() { +// bool dEvLib_callback_c::eventStart() { +extern "C" bool eventStart__17dEvLib_callback_cFv() { return true; } /* 80CB3E2C-80CB3E34 0015CC 0008+00 1/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventRun() { +// bool dEvLib_callback_c::eventRun() { +extern "C" bool eventRun__17dEvLib_callback_cFv() { return true; } /* 80CB3E34-80CB3E3C 0015D4 0008+00 1/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventEnd() { +// bool dEvLib_callback_c::eventEnd() { +extern "C" bool eventEnd__17dEvLib_callback_cFv() { return true; } diff --git a/rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.cpp b/rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.cpp index 4ef8802068a..ede4b73cac3 100644 --- a/rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.cpp +++ b/rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.cpp @@ -1,158 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_poTbox -// +/** + * @file d_a_obj_poTbox.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80CB4280 */ ~mDoHIO_entry_c(); -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c {}; - -struct daPoTbox_c { - /* 80CB42C8 */ void setBaseMtx(); - /* 80CB43D0 */ void CreateHeap(); - /* 80CB46C4 */ void create(); - /* 80CB499C */ void Execute(f32 (**)[3][4]); - /* 80CB4AA8 */ void init_modeWait(); - /* 80CB4AB4 */ void modeWait(); - /* 80CB4B10 */ void init_modeOpen(); - /* 80CB4BF8 */ void modeOpen(); - /* 80CB4C54 */ void init_modeOpenEnd(); - /* 80CB4C60 */ void modeOpenEnd(); - /* 80CB4C84 */ void init_modeEnd(); - /* 80CB4C90 */ void modeEnd(); - /* 80CB4C94 */ void Draw(); - /* 80CB4E14 */ void Delete(); -}; - -struct daPoTbox_HIO_c { - /* 80CB424C */ daPoTbox_HIO_c(); - /* 80CB4F14 */ ~daPoTbox_HIO_c(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80CB4954 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -225,17 +79,11 @@ extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -344,25 +192,30 @@ SECTION_DATA static u8 mode_proc[48] = { #pragma pop /* 80CB5084-80CB50A4 -00001 0020+00 1/0 0/0 0/0 .data l_daPoTbox_Method */ -SECTION_DATA static void* l_daPoTbox_Method[8] = { - (void*)daPoTbox_Create__FP10fopAc_ac_c, - (void*)daPoTbox_Delete__FP10daPoTbox_c, - (void*)daPoTbox_Execute__FP10daPoTbox_c, - (void*)NULL, - (void*)daPoTbox_Draw__FP10daPoTbox_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daPoTbox_Method = { + (process_method_func)daPoTbox_Create__FP10fopAc_ac_c, + (process_method_func)daPoTbox_Delete__FP10daPoTbox_c, + (process_method_func)daPoTbox_Execute__FP10daPoTbox_c, + 0, + (process_method_func)daPoTbox_Draw__FP10daPoTbox_c, }; /* 80CB50A4-80CB50D4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_poTbox */ -SECTION_DATA extern void* g_profile_Obj_poTbox[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01930000, (void*)&g_fpcLf_Method, - (void*)0x00000608, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02940000, (void*)&l_daPoTbox_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_poTbox = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_poTbox, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daPoTbox_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 660, // mPriority + &l_daPoTbox_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CB50D4-80CB50E0 0000E8 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ @@ -414,7 +267,8 @@ asm daPoTbox_HIO_c::daPoTbox_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox/__dt__14mDoHIO_entry_cFv.s" } @@ -470,7 +324,8 @@ asm void daPoTbox_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_pumpkin/d_a_obj_pumpkin.cpp b/rel/d/a/obj/d_a_obj_pumpkin/d_a_obj_pumpkin.cpp index 351422f49ba..d1a11a2d8eb 100644 --- a/rel/d/a/obj/d_a_obj_pumpkin/d_a_obj_pumpkin.cpp +++ b/rel/d/a/obj/d_a_obj_pumpkin/d_a_obj_pumpkin.cpp @@ -1,171 +1,14 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_pumpkin -// +/** + * @file d_a_obj_pumpkin.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_pumpkin/d_a_obj_pumpkin.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daPy_boomerangMove_c { - /* 8015E5B0 */ void initOffset(cXyz const*); - /* 8015E654 */ void posMove(cXyz*, s16*, fopAc_ac_c*, s16); - /* 8015E87C */ void bgCheckAfterOffset(cXyz const*); -}; - -struct daObj_Pumpkin_c { - /* 80CB578C */ ~daObj_Pumpkin_c(); - /* 80CB5A04 */ void create(); - /* 80CB5F88 */ void CreateHeap(); - /* 80CB6018 */ void Delete(); - /* 80CB604C */ void Execute(); - /* 80CB7638 */ void Draw(); - /* 80CB7824 */ void createHeapCallBack(fopAc_ac_c*); - /* 80CB7844 */ void isDelete(); - /* 80CB78C8 */ void setEnvTevColor(); - /* 80CB7924 */ void setRoomNo(); - /* 80CB7968 */ void reset(); - /* 80CB79DC */ void setMtx(); - /* 80CB7AE4 */ void calcRollAngle(s16, int); - /* 80CB7B84 */ void getWallAngle(s16, s16*); - /* 80CB7D14 */ void setSmokePrtcl(); - /* 80CB7D98 */ void setWaterPrtcl(); - /* 80CB7E98 */ void setHamonPrtcl(); - /* 80CB7EF4 */ void crash(); -}; - -struct daObj_Pumpkin_Param_c { - /* 80CB8304 */ ~daObj_Pumpkin_Param_c(); - - static u8 const m[52]; -}; - -struct daNpc_Jagar_Param_c { - static u8 const m[160]; -}; - -struct daNpcT_c { - /* 8014ACF0 */ void chkPointInArea(cXyz, cXyz, f32, f32, f32, s16); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B8B4 */ void forceOnEventMove(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; -struct _GXTexObj {}; - -struct dDlst_shadowControl_c { - /* 80055F84 */ void setSimple(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*); - - static u8 mSimpleTexObj[32]; -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80CB5F18 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F40 */ void SetWallR(f32); - /* 80CB5E4C */ ~dBgS_AcchCir(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct dBgS { - /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_LinChk {}; - -struct cBgS_GndChk { - /* 80267C1C */ cBgS_GndChk(); - /* 80267C94 */ ~cBgS_GndChk(); -}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -298,9 +141,6 @@ extern "C" void cLib_chaseF__FPfff(); extern "C" void cLib_chaseAngleS__FPsss(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void _savegpr_24(); extern "C" void _savegpr_25(); extern "C" void _savegpr_26(); @@ -309,8 +149,6 @@ extern "C" void _restgpr_24(); extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -319,7 +157,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" u8 const m__19daNpc_Jagar_Param_c[160]; @@ -387,25 +224,30 @@ SECTION_DATA static u8 emttrId[8] = { }; /* 80CB84E8-80CB8508 -00001 0020+00 1/0 0/0 0/0 .data daObj_Pumpkin_MethodTable */ -SECTION_DATA static void* daObj_Pumpkin_MethodTable[8] = { - (void*)daObj_Pumpkin_Create__FPv, - (void*)daObj_Pumpkin_Delete__FPv, - (void*)daObj_Pumpkin_Execute__FPv, - (void*)daObj_Pumpkin_IsDelete__FPv, - (void*)daObj_Pumpkin_Draw__FPv, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObj_Pumpkin_MethodTable = { + (process_method_func)daObj_Pumpkin_Create__FPv, + (process_method_func)daObj_Pumpkin_Delete__FPv, + (process_method_func)daObj_Pumpkin_Execute__FPv, + (process_method_func)daObj_Pumpkin_IsDelete__FPv, + (process_method_func)daObj_Pumpkin_Draw__FPv, }; /* 80CB8508-80CB8538 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_PUMPKIN */ -SECTION_DATA extern void* g_profile_OBJ_PUMPKIN[12] = { - (void*)0xFFFFFFFD, (void*)0x0008FFFD, - (void*)0x02F80000, (void*)&g_fpcLf_Method, - (void*)0x00000BBC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02CC0000, (void*)&daObj_Pumpkin_MethodTable, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_PUMPKIN = { + fpcLy_CURRENT_e, // mLayerID + 8, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_PUMPKIN, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObj_Pumpkin_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 716, // mPriority + &daObj_Pumpkin_MethodTable, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CB8538-80CB8544 0000CC 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGPla */ @@ -566,7 +408,8 @@ extern "C" asm void __dt__8cM3dGAabFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_pumpkin/d_a_obj_pumpkin/__dt__12dBgS_AcchCirFv.s" } @@ -587,7 +430,8 @@ extern "C" asm void __dt__10dCcD_GSttsFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_pumpkin/d_a_obj_pumpkin/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.cpp b/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.cpp index df25c20a420..123ab53014c 100644 --- a/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.cpp +++ b/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.cpp @@ -1,125 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_rfHole -// +/** + * @file d_a_obj_rfHole.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80CB8EBC */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct dBgW {}; - -struct daRfHole_c { - /* 80CB8F04 */ void setBaseMtx(); - /* 80CB8F8C */ void CreateHeap(); - /* 80CB8FF8 */ void create(); - /* 80CB9148 */ void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*); - /* 80CB9194 */ void playerAreaCheck(); - /* 80CB940C */ void Execute(f32 (**)[3][4]); - /* 80CB9464 */ void holeProc(); - /* 80CB9520 */ void init_modeWait(); - /* 80CB952C */ void modeWait(); - /* 80CB9558 */ void init_modeBreak(); - /* 80CB96AC */ void modeBreak(); - /* 80CB96CC */ void init_modeBreakEff(); - /* 80CB971C */ void modeBreakEff(); - /* 80CB973C */ void init_modeEnd(); - /* 80CB9748 */ void modeEnd(); - /* 80CB9768 */ void setBreakEffect(); - /* 80CB9878 */ void Draw(); - /* 80CB991C */ void Delete(); -}; - -struct daRfHole_HIO_c { - /* 80CB8E6C */ daRfHole_HIO_c(); - /* 80CB99D8 */ ~daRfHole_HIO_c(); -}; - -struct Vec {}; -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; - /* 80266B34 */ void operator-(Vec const&) const; -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -188,22 +75,13 @@ extern "C" void __pl__4cXyzCFRC3Vec(); extern "C" void __mi__4cXyzCFRC3Vec(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECSquareMag(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_26(); extern "C" void _savegpr_28(); extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -309,25 +187,30 @@ SECTION_DATA static u8 mode_proc[48] = { #pragma pop /* 80CB9B4C-80CB9B6C -00001 0020+00 1/0 0/0 0/0 .data l_daRfHole_Method */ -SECTION_DATA static void* l_daRfHole_Method[8] = { - (void*)daRfHole_Create__FP10fopAc_ac_c, - (void*)daRfHole_Delete__FP10daRfHole_c, - (void*)daRfHole_Execute__FP10daRfHole_c, - (void*)NULL, - (void*)daRfHole_Draw__FP10daRfHole_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daRfHole_Method = { + (process_method_func)daRfHole_Create__FP10fopAc_ac_c, + (process_method_func)daRfHole_Delete__FP10daRfHole_c, + (process_method_func)daRfHole_Execute__FP10daRfHole_c, + 0, + (process_method_func)daRfHole_Draw__FP10daRfHole_c, }; /* 80CB9B6C-80CB9B9C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_RfHole */ -SECTION_DATA extern void* g_profile_Obj_RfHole[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00430000, (void*)&g_fpcLf_Method, - (void*)0x000005B4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02020000, (void*)&l_daRfHole_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_RfHole = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_RfHole, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daRfHole_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 514, // mPriority + &l_daRfHole_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CB9B9C-80CB9BC4 0000D0 0028+00 1/1 0/0 0/0 .data __vt__10daRfHole_c */ @@ -372,7 +255,8 @@ asm daRfHole_HIO_c::daRfHole_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/__dt__14mDoHIO_entry_cFv.s" } diff --git a/rel/d/a/obj/d_a_obj_riverrock/d_a_obj_riverrock.cpp b/rel/d/a/obj/d_a_obj_riverrock/d_a_obj_riverrock.cpp index a9220c602e4..4311016c2a8 100644 --- a/rel/d/a/obj/d_a_obj_riverrock/d_a_obj_riverrock.cpp +++ b/rel/d/a/obj/d_a_obj_riverrock/d_a_obj_riverrock.cpp @@ -1,140 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_riverrock -// +/** + * @file d_a_obj_riverrock.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_riverrock/d_a_obj_riverrock.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjRIVERROCK_c { - /* 80CBC6F4 */ void initCcCylinder(); - /* 80CBC754 */ void SetCcCyl(); - /* 80CBC7F8 */ void BreakWaitAction(); - /* 80CBC8BC */ void CheckBG(); - /* 80CBCC3C */ void BreakMoveAction(); - /* 80CBCCC0 */ void BrokenAction(); - /* 80CBCD94 */ void BreakAction(); - /* 80CBCDE8 */ void Action(); - /* 80CBCE2C */ void BreakSet(); - /* 80CBD1C4 */ void WaitAction(); - /* 80CBD204 */ void setBaseMtx(); - /* 80CBD348 */ void CreateHeap(); - /* 80CBD3C0 */ void create(); - /* 80CBD7B4 */ void Create(); - /* 80CBD814 */ void Execute(f32 (**)[3][4]); - /* 80CBD8E0 */ void Draw(); - /* 80CBD964 */ void Delete(); -}; - -struct daObjRIVERROCK_HIO_c { - /* 80CBC6CC */ daObjRIVERROCK_HIO_c(); - /* 80CBD9C4 */ ~daObjRIVERROCK_HIO_c(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C6B8 */ void getObjectResName2Index(char const*, char const*); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS { - /* 80074CBC */ void GetSpecialCode(cBgS_PolyInfo const&); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_LinChk {}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDFF8 */ void deleteObject(); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; -struct J3DModel {}; // // Forward References: @@ -220,12 +93,8 @@ extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void deleteObject__14Z2SoundObjBaseFv(); extern "C" void __ct__16Z2SoundObjSimpleFv(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -233,8 +102,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -263,25 +130,30 @@ SECTION_DEAD static char const* const stringBase_80CBDB14 = "RiverRock"; SECTION_DATA static void* l_arcName = (void*)&d_a_obj_riverrock__stringBase0; /* 80CBDB44-80CBDB64 -00001 0020+00 1/0 0/0 0/0 .data l_daObjRIVERROCK_Method */ -SECTION_DATA static void* l_daObjRIVERROCK_Method[8] = { - (void*)daObjRIVERROCK_Create__FP10fopAc_ac_c, - (void*)daObjRIVERROCK_Delete__FP16daObjRIVERROCK_c, - (void*)daObjRIVERROCK_Execute__FP16daObjRIVERROCK_c, - (void*)daObjRIVERROCK_IsDelete__FP16daObjRIVERROCK_c, - (void*)daObjRIVERROCK_Draw__FP16daObjRIVERROCK_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjRIVERROCK_Method = { + (process_method_func)daObjRIVERROCK_Create__FP10fopAc_ac_c, + (process_method_func)daObjRIVERROCK_Delete__FP16daObjRIVERROCK_c, + (process_method_func)daObjRIVERROCK_Execute__FP16daObjRIVERROCK_c, + (process_method_func)daObjRIVERROCK_IsDelete__FP16daObjRIVERROCK_c, + (process_method_func)daObjRIVERROCK_Draw__FP16daObjRIVERROCK_c, }; /* 80CBDB64-80CBDB94 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_RIVERROCK */ -SECTION_DATA extern void* g_profile_Obj_RIVERROCK[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00750000, (void*)&g_fpcLf_Method, - (void*)0x0000079C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01D80000, (void*)&l_daObjRIVERROCK_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_RIVERROCK = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_RIVERROCK, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjRIVERROCK_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 472, // mPriority + &l_daObjRIVERROCK_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CBDB94-80CBDBA0 000054 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ diff --git a/rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.cpp b/rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.cpp index c79f1924c53..f65e08ccce5 100644 --- a/rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.cpp +++ b/rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_rock -// +/** + * @file d_a_obj_rock.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.h" diff --git a/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.cpp b/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.cpp index 8758234337a..16f30276ffd 100644 --- a/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.cpp +++ b/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.cpp @@ -1,136 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_rope_bridge -// +/** + * @file d_a_obj_rope_bridge.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CDD4 */ void transM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct mDoExt_3DlineMat_c {}; - -struct mDoExt_3DlineMatSortPacket { - /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); -}; - -struct ResTIMG {}; - -struct _GXColor {}; - -struct dKy_tevstr_c {}; - -struct mDoExt_3DlineMat1_c { - /* 80013360 */ void init(u16, u16, ResTIMG*, int); - /* 8001373C */ void update(int, f32, _GXColor&, u16, dKy_tevstr_c*); -}; - -struct fopAc_ac_c {}; - -struct fopAcM_lc_c { - /* 8001DC68 */ void lineCheck(cXyz const*, cXyz const*, fopAc_ac_c const*); - - static u8 mLineCheck[112]; -}; - -struct daObjRBridge_c { - /* 80595E38 */ void initBaseMtx(); - /* 80595ED8 */ void setBaseMtx(); - /* 80595F84 */ void checkE3Special(); - /* 80595FE0 */ void setStPos(); - /* 8059616C */ void initLinePos(); - /* 805963C4 */ void setLinePos(); - /* 80596768 */ void getLinePosSt(cXyz*); - /* 805967E4 */ void getLinePosBrg(int, cXyz*); - /* 8059689C */ void checkTight(); - /* 805969FC */ void Create(); - /* 80596B88 */ void CreateHeap(); - /* 80596DEC */ void create1st(); - /* 80596EBC */ void Execute(f32 (**)[3][4]); - /* 80596FA8 */ void action(); - /* 8059715C */ void init_wait(); - /* 80597170 */ void mode_wait(); - /* 805973BC */ void init_cut(); - /* 805973E4 */ void mode_cut(); - /* 805975E8 */ void init_end(); - /* 805975F4 */ void mode_end(); - /* 805975F8 */ void Draw(); - /* 805977D0 */ void checkHimoCulling(); - /* 805978BC */ void Delete(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dAttLook_c { - /* 80073D08 */ void request(fopAc_ac_c*, f32, f32, f32, s16, int); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDFF8 */ void deleteObject(); - /* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*); -}; - -struct J3DModel {}; // // Forward References: @@ -239,8 +115,6 @@ extern "C" void __ct__16Z2SoundObjSimpleFv(); extern "C" void* __nw__FUl(); extern "C" void* __nwa__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void __construct_array(); extern "C" void __construct_new_array(); extern "C" void __ptmf_scall(); @@ -255,8 +129,6 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" void _restgpr_29(); extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__8dCcD_Cps[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -267,8 +139,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" u8 mLineCheck__11fopAcM_lc_c[112]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_805980F8[4]; @@ -751,25 +621,30 @@ SECTION_DATA static u8 l_fall_end_se[8] = { }; /* 8059803C-8059805C -00001 0020+00 1/0 0/0 0/0 .data daObjRBridge_METHODS */ -SECTION_DATA static void* daObjRBridge_METHODS[8] = { - (void*)daObjRBridge_create1st__FP14daObjRBridge_c, - (void*)daObjRBridge_MoveBGDelete__FP14daObjRBridge_c, - (void*)daObjRBridge_MoveBGExecute__FP14daObjRBridge_c, - (void*)NULL, - (void*)daObjRBridge_MoveBGDraw__FP14daObjRBridge_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjRBridge_METHODS = { + (process_method_func)daObjRBridge_create1st__FP14daObjRBridge_c, + (process_method_func)daObjRBridge_MoveBGDelete__FP14daObjRBridge_c, + (process_method_func)daObjRBridge_MoveBGExecute__FP14daObjRBridge_c, + 0, + (process_method_func)daObjRBridge_MoveBGDraw__FP14daObjRBridge_c, }; /* 8059805C-8059808C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_RopeBridge */ -SECTION_DATA extern void* g_profile_Obj_RopeBridge[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00850000, (void*)&g_fpcLf_Method, - (void*)0x00000B6C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00100000, (void*)&daObjRBridge_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_RopeBridge = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_RopeBridge, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjRBridge_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 16, // mPriority + &daObjRBridge_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 8059808C-80598098 000228 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ diff --git a/rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge.cpp b/rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge.cpp index b501256d7c6..1622d851d92 100644 --- a/rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge.cpp +++ b/rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge.cpp @@ -1,146 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_rotBridge -// +/** + * @file d_a_obj_rotBridge.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80CBE9DC */ ~mDoHIO_entry_c(); -}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c {}; -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct daRotBridge_c { - /* 80CBEA24 */ void setBaseMtx(); - /* 80CBEB38 */ void CreateHeap(); - /* 80CBECBC */ void create(); - /* 80CBEF1C */ void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*); - /* 80CBEF34 */ void Execute(f32 (**)[3][4]); - /* 80CBF050 */ void playerAreaCheck(); - /* 80CBF1EC */ void moveBridge(); - /* 80CBF404 */ void Draw(); - /* 80CBF4BC */ void Delete(); -}; - -struct daRotBridge_HIO_c { - /* 80CBE98C */ daRotBridge_HIO_c(); - /* 80CBF5BC */ ~daRotBridge_HIO_c(); -}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW_Base {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel { - /* 80327BD4 */ void calcAnmMtx(); -}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80CBEED4 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -209,18 +75,10 @@ extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void calcAnmMtx__8J3DModelFv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSVECSquareMag(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -248,25 +106,30 @@ SECTION_DATA static void* l_resNameIdx[3] = { }; /* 80CBF6E4-80CBF704 -00001 0020+00 1/0 0/0 0/0 .data l_daRotBridge_Method */ -SECTION_DATA static void* l_daRotBridge_Method[8] = { - (void*)daRotBridge_Create__FP10fopAc_ac_c, - (void*)daRotBridge_Delete__FP13daRotBridge_c, - (void*)daRotBridge_Execute__FP13daRotBridge_c, - (void*)NULL, - (void*)daRotBridge_Draw__FP13daRotBridge_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daRotBridge_Method = { + (process_method_func)daRotBridge_Create__FP10fopAc_ac_c, + (process_method_func)daRotBridge_Delete__FP13daRotBridge_c, + (process_method_func)daRotBridge_Execute__FP13daRotBridge_c, + 0, + (process_method_func)daRotBridge_Draw__FP13daRotBridge_c, }; /* 80CBF704-80CBF734 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_RotBridge */ -SECTION_DATA extern void* g_profile_Obj_RotBridge[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00360000, (void*)&g_fpcLf_Method, - (void*)0x00000610, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01EA0000, (void*)&l_daRotBridge_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_RotBridge = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_RotBridge, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daRotBridge_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 490, // mPriority + &l_daRotBridge_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CBF734-80CBF740 00005C 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ @@ -318,7 +181,8 @@ asm daRotBridge_HIO_c::daRotBridge_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge/__dt__14mDoHIO_entry_cFv.s" } @@ -398,7 +262,8 @@ asm void daRotBridge_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap.cpp b/rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap.cpp index 2309bb91d3d..6816a06b028 100644 --- a/rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap.cpp +++ b/rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap.cpp @@ -1,178 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_rotTrap -// +/** + * @file d_a_obj_rotTrap.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80CBF8F8 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct daRotTrap_c { - /* 80CBF940 */ void setBaseMtx(); - /* 80CBF9D8 */ void CreateHeap(); - /* 80CBFAC8 */ void create(); - /* 80CBFEC4 */ void Execute(f32 (**)[3][4]); - /* 80CBFF1C */ void procMain(); - /* 80CC00AC */ void init_modeWait(); - /* 80CC0120 */ void modeWait(); - /* 80CC0180 */ void init_modeAcc(); - /* 80CC027C */ void modeAcc(); - /* 80CC034C */ void init_modeMove(); - /* 80CC0360 */ void modeMove(); - /* 80CC0440 */ void seSet(); - /* 80CC0548 */ void Draw(); - /* 80CC05EC */ void Delete(); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; -}; - -struct daRotTrap_HIO_c { - /* 80CBF8AC */ daRotTrap_HIO_c(); - /* 80CC0728 */ ~daRotTrap_HIO_c(); -}; - -struct cXyz {}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); - /* 80CBFE68 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); - /* 80CBFC88 */ ~dCcD_Cyl(); - /* 80CBFD54 */ dCcD_Cyl(); -}; -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80CBFDD8 */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80CBFE20 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80CC06E0 */ ~cCcD_GStts(); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -258,18 +92,12 @@ extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); extern "C" void __construct_array(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_20(); extern "C" void _savegpr_25(); extern "C" void _restgpr_20(); extern "C" void _restgpr_25(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -277,8 +105,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -388,25 +214,30 @@ SECTION_DATA static u8 mode_proc[36] = { #pragma pop /* 80CC09EC-80CC0A0C -00001 0020+00 1/0 0/0 0/0 .data l_daRotTrap_Method */ -SECTION_DATA static void* l_daRotTrap_Method[8] = { - (void*)daRotTrap_Create__FP10fopAc_ac_c, - (void*)daRotTrap_Delete__FP11daRotTrap_c, - (void*)daRotTrap_Execute__FP11daRotTrap_c, - (void*)NULL, - (void*)daRotTrap_Draw__FP11daRotTrap_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daRotTrap_Method = { + (process_method_func)daRotTrap_Create__FP10fopAc_ac_c, + (process_method_func)daRotTrap_Delete__FP11daRotTrap_c, + (process_method_func)daRotTrap_Execute__FP11daRotTrap_c, + 0, + (process_method_func)daRotTrap_Draw__FP11daRotTrap_c, }; /* 80CC0A0C-80CC0A3C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_RotTrap */ -SECTION_DATA extern void* g_profile_Obj_RotTrap[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x004B0000, (void*)&g_fpcLf_Method, - (void*)0x0000173C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x020D0000, (void*)&l_daRotTrap_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_RotTrap = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_RotTrap, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daRotTrap_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 525, // mPriority + &l_daRotTrap_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CC0A3C-80CC0A48 0001DC 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -479,7 +310,8 @@ asm daRotTrap_HIO_c::daRotTrap_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap/__dt__14mDoHIO_entry_cFv.s" } @@ -526,7 +358,8 @@ asm void daRotTrap_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Cyl::~dCcD_Cyl() { +// asm dCcD_Cyl::~dCcD_Cyl() { +extern "C" asm void __dt__8dCcD_CylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap/__dt__8dCcD_CylFv.s" } @@ -536,7 +369,8 @@ asm dCcD_Cyl::~dCcD_Cyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Cyl::dCcD_Cyl() { +// asm dCcD_Cyl::dCcD_Cyl() { +extern "C" asm void __ct__8dCcD_CylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap/__ct__8dCcD_CylFv.s" } @@ -546,7 +380,8 @@ asm dCcD_Cyl::dCcD_Cyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap/__dt__8cM3dGCylFv.s" } @@ -556,7 +391,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap/__dt__8cM3dGAabFv.s" } @@ -566,7 +402,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap/__dt__10dCcD_GSttsFv.s" } @@ -793,7 +630,8 @@ static asm void daRotTrap_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.cpp b/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.cpp index 7e09f31b74e..39464378345 100644 --- a/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.cpp +++ b/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.cpp @@ -1,111 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_roten -// +/** + * @file d_a_obj_roten.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObj_Roten_c { - /* 80CC0B58 */ void initBaseMtx(); - /* 80CC0B94 */ void setBaseMtx(); - /* 80CC0C20 */ void Create(); - /* 80CC0EC4 */ void CreateHeap(); - /* 80CC0F40 */ void create(); - /* 80CC1038 */ void Execute(f32 (**)[3][4]); - /* 80CC1138 */ void Draw(); - /* 80CC1254 */ void Delete(); - /* 80CC12E4 */ void getResName(); - /* 80CC1388 */ ~daObj_Roten_c(); -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -160,16 +60,10 @@ extern "C" void dKy_BossLight_set__FP4cXyzP8_GXColorfUc(); extern "C" void cLib_addCalc__FPfffff(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -306,25 +200,30 @@ asm void daObj_Roten_c::CreateHeap() { SECTION_DATA static u32 l_dzbFileIdx = 0x00000007; /* 80CC1458-80CC1478 -00001 0020+00 1/0 0/0 0/0 .data daObj_Roten_MethodTable */ -SECTION_DATA static void* daObj_Roten_MethodTable[8] = { - (void*)daObj_Roten_Create__FPv, - (void*)daObj_Roten_Delete__FPv, - (void*)daObj_Roten_Execute__FPv, - (void*)daObj_Roten_IsDelete__FPv, - (void*)daObj_Roten_Draw__FPv, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObj_Roten_MethodTable = { + (process_method_func)daObj_Roten_Create__FPv, + (process_method_func)daObj_Roten_Delete__FPv, + (process_method_func)daObj_Roten_Execute__FPv, + (process_method_func)daObj_Roten_IsDelete__FPv, + (process_method_func)daObj_Roten_Draw__FPv, }; /* 80CC1478-80CC14A8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_ROTEN */ -SECTION_DATA extern void* g_profile_OBJ_ROTEN[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x011F0000, (void*)&g_fpcLf_Method, - (void*)0x000005C8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00430000, (void*)&daObj_Roten_MethodTable, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_ROTEN = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_ROTEN, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObj_Roten_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 67, // mPriority + &daObj_Roten_MethodTable, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CC14A8-80CC14D4 00005C 002C+00 2/2 0/0 0/0 .data __vt__13daObj_Roten_c */ diff --git a/rel/d/a/obj/d_a_obj_rstair/d_a_obj_rstair.cpp b/rel/d/a/obj/d_a_obj_rstair/d_a_obj_rstair.cpp index 9e863a1a764..73b9e22d2c2 100644 --- a/rel/d/a/obj/d_a_obj_rstair/d_a_obj_rstair.cpp +++ b/rel/d/a/obj/d_a_obj_rstair/d_a_obj_rstair.cpp @@ -1,165 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_rstair -// +/** + * @file d_a_obj_rstair.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_rstair/d_a_obj_rstair.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c {}; - -struct daObjRotStair_c { - /* 80CC1558 */ void initBaseMtx(); - /* 80CC1614 */ void setBaseMtx(); - /* 80CC16B0 */ void Create(); - /* 80CC17F0 */ void CreateHeap(); - /* 80CC1A28 */ void create1st(); - /* 80CC1AF0 */ void Execute(f32 (**)[3][4]); - /* 80CC1BA4 */ void move_proc_call(); - /* 80CC1C30 */ void init_modeWait(); - /* 80CC1CF0 */ void modeWait(); - /* 80CC1DF8 */ void init_modeRotate(); - /* 80CC1EC8 */ void modeRotate(); - /* 80CC2024 */ void event_proc_call(); - /* 80CC20E0 */ void actionWait(); - /* 80CC2158 */ void actionOrderEvent(); - /* 80CC21C0 */ void actionEvent(); - /* 80CC221C */ void actionDead(); - /* 80CC2220 */ void checkChangeSw(); - /* 80CC22A0 */ void offSwitch(int); - /* 80CC2310 */ void onWaterModel(); - /* 80CC2364 */ void offWaterModel(); - /* 80CC23C4 */ void Draw(); - /* 80CC25C0 */ void Delete(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 800352B0 */ void offSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData { - /* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]); -}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dEvent_manager_c { - /* 80047698 */ void getEventIdx(fopAc_ac_c*, u8); - /* 80047A78 */ void endCheck(s16); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DTexMtxInfo { - /* 80325794 */ void setEffectMtx(f32 (*)[4]); -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80CC19E0 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -242,8 +88,6 @@ extern "C" void __dl__FPv(); extern "C" void setEffectMtx__13J3DTexMtxInfoFPA4_f(); extern "C" void simpleCalcMaterial__12J3DModelDataFUsPA4_f(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void C_MTXLightPerspective(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_19(); extern "C" void _savegpr_27(); @@ -253,14 +97,8 @@ extern "C" void _restgpr_19(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void abs(); -extern "C" extern u8 const j3dDefaultMtx[48]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 struct_80CC2880[4]; @@ -443,25 +281,30 @@ SECTION_DATA static u8 l_func_3918[48] = { #pragma pop /* 80CC27FC-80CC281C -00001 0020+00 1/0 0/0 0/0 .data daObjRotStair_METHODS */ -SECTION_DATA static void* daObjRotStair_METHODS[8] = { - (void*)daObjRotStair_create1st__FP15daObjRotStair_c, - (void*)daObjRotStair_MoveBGDelete__FP15daObjRotStair_c, - (void*)daObjRotStair_MoveBGExecute__FP15daObjRotStair_c, - (void*)NULL, - (void*)daObjRotStair_MoveBGDraw__FP15daObjRotStair_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjRotStair_METHODS = { + (process_method_func)daObjRotStair_create1st__FP15daObjRotStair_c, + (process_method_func)daObjRotStair_MoveBGDelete__FP15daObjRotStair_c, + (process_method_func)daObjRotStair_MoveBGExecute__FP15daObjRotStair_c, + 0, + (process_method_func)daObjRotStair_MoveBGDraw__FP15daObjRotStair_c, }; /* 80CC281C-80CC284C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_RotStair */ -SECTION_DATA extern void* g_profile_Obj_RotStair[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00C50000, (void*)&g_fpcLf_Method, - (void*)0x000005E4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02650000, (void*)&daObjRotStair_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_RotStair = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_RotStair, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjRotStair_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 613, // mPriority + &daObjRotStair_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CC284C-80CC2858 000110 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ @@ -485,7 +328,8 @@ asm void daObjRotStair_c::CreateHeap() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_rstair/d_a_obj_rstair/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_rw/d_a_obj_rw.cpp b/rel/d/a/obj/d_a_obj_rw/d_a_obj_rw.cpp index d991dd62a93..7f1a94b7a66 100644 --- a/rel/d/a/obj/d_a_obj_rw/d_a_obj_rw.cpp +++ b/rel/d/a/obj/d_a_obj_rw/d_a_obj_rw.cpp @@ -1,97 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_rw -// +/** + * @file d_a_obj_rw.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_rw/d_a_obj_rw.h" -#include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_rw_class {}; - -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static u8 mGndCheck[84]; -}; - -struct daObj { - /* 80037900 */ void HitSeStart(cXyz const*, int, dCcD_GObjInf const*, u32); -}; - -struct daOBJ_RW_HIO_c { - /* 80CC298C */ daOBJ_RW_HIO_c(); - /* 80CC3A5C */ ~daOBJ_RW_HIO_c(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dCcU_AtInfo {}; - -struct csXyz {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_PolyInfo {}; - -struct _GXTexObj {}; - -struct Z2CreatureEnemy { - /* 802C0F64 */ Z2CreatureEnemy(); - /* 802C1094 */ void init(Vec*, Vec*, u8, u8); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DSys { - static u8 mCurrentMtx[48]; -}; - -struct J3DModel {}; - -struct J3DJoint {}; // // Forward References: @@ -172,8 +86,6 @@ extern "C" void MtxPosition__FP4cXyzP4cXyz(); extern "C" void __ct__15Z2CreatureEnemyFv(); extern "C" void init__15Z2CreatureEnemyFP3VecP3VecUcUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __construct_array(); extern "C" void _savegpr_21(); extern "C" void _savegpr_24(); @@ -183,8 +95,6 @@ extern "C" void _restgpr_21(); extern "C" void _restgpr_24(); extern "C" void _restgpr_25(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -196,8 +106,6 @@ extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" u8 mGndCheck__11fopAcM_gc_c[84]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; @@ -251,25 +159,30 @@ static dCcD_SrcCyl cc_cyl_src = { }; /* 80CC3BF8-80CC3C18 -00001 0020+00 1/0 0/0 0/0 .data l_daOBJ_RW_Method */ -SECTION_DATA static void* l_daOBJ_RW_Method[8] = { - (void*)daOBJ_RW_Create__FP10fopAc_ac_c, - (void*)daOBJ_RW_Delete__FP12obj_rw_class, - (void*)daOBJ_RW_Execute__FP12obj_rw_class, - (void*)daOBJ_RW_IsDelete__FP12obj_rw_class, - (void*)daOBJ_RW_Draw__FP12obj_rw_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daOBJ_RW_Method = { + (process_method_func)daOBJ_RW_Create__FP10fopAc_ac_c, + (process_method_func)daOBJ_RW_Delete__FP12obj_rw_class, + (process_method_func)daOBJ_RW_Execute__FP12obj_rw_class, + (process_method_func)daOBJ_RW_IsDelete__FP12obj_rw_class, + (process_method_func)daOBJ_RW_Draw__FP12obj_rw_class, }; /* 80CC3C18-80CC3C48 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_RW */ -SECTION_DATA extern void* g_profile_OBJ_RW[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02200000, (void*)&g_fpcLf_Method, - (void*)0x00000E3C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02C70000, (void*)&l_daOBJ_RW_Method, - (void*)0x00040100, (void*)0x020E0000, +extern actor_process_profile_definition g_profile_OBJ_RW = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_RW, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(obj_rw_class), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 711, // mPriority + &l_daOBJ_RW_Method, // sub_method + 0x00040100, // mStatus + fopAc_ENEMY_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CC3C48-80CC3C54 0000F4 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGSph */ diff --git a/rel/d/a/obj/d_a_obj_sWallShutter/d_a_obj_sWallShutter.cpp b/rel/d/a/obj/d_a_obj_sWallShutter/d_a_obj_sWallShutter.cpp index 417e0880dff..b45c363e089 100644 --- a/rel/d/a/obj/d_a_obj_sWallShutter/d_a_obj_sWallShutter.cpp +++ b/rel/d/a/obj/d_a_obj_sWallShutter/d_a_obj_sWallShutter.cpp @@ -1,127 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_sWallShutter -// +/** + * @file d_a_obj_sWallShutter.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_sWallShutter/d_a_obj_sWallShutter.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 8059825C */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct daSwShutter_c { - /* 805982A4 */ void setBaseMtx(); - /* 80598344 */ void CreateHeap(); - /* 805983C4 */ void create(); - /* 80598564 */ void Execute(f32 (**)[3][4]); - /* 805985B4 */ void moveMain(); - /* 8059873C */ void init_modeWait(); - /* 80598748 */ void modeWait(); - /* 8059879C */ void init_modeMoveDownInit(); - /* 805989D0 */ void modeMoveDownInit(); - /* 80598A04 */ void init_modeMoveDown(); - /* 80598AFC */ void modeMoveDown(); - /* 80598D4C */ void init_modeMoveDownEnd(); - /* 80598D58 */ void modeMoveDownEnd(); - /* 80598D5C */ void Draw(); - /* 80598E00 */ void Delete(); -}; - -struct daSwShutter_HIO_c { - /* 805981EC */ daSwShutter_HIO_c(); - /* 80598ECC */ ~daSwShutter_HIO_c(); -}; - -struct cXyz {}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); - /* 8006FB10 */ void StartQuake(int, int, cXyz); - /* 8006FD94 */ void StopQuake(int); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -188,17 +73,11 @@ extern "C" void cLib_addCalc__FPfffff(); extern "C" void cLib_chaseF__FPfff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -348,25 +227,30 @@ SECTION_DATA static u8 mode_proc[48] = { #pragma pop /* 80599050-80599070 -00001 0020+00 1/0 0/0 0/0 .data l_daSwShutter_Method */ -SECTION_DATA static void* l_daSwShutter_Method[8] = { - (void*)daSwShutter_Create__FP10fopAc_ac_c, - (void*)daSwShutter_Delete__FP13daSwShutter_c, - (void*)daSwShutter_Execute__FP13daSwShutter_c, - (void*)NULL, - (void*)daSwShutter_Draw__FP13daSwShutter_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daSwShutter_Method = { + (process_method_func)daSwShutter_Create__FP10fopAc_ac_c, + (process_method_func)daSwShutter_Delete__FP13daSwShutter_c, + (process_method_func)daSwShutter_Execute__FP13daSwShutter_c, + 0, + (process_method_func)daSwShutter_Draw__FP13daSwShutter_c, }; /* 80599070-805990A0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_SwallShutter */ -SECTION_DATA extern void* g_profile_Obj_SwallShutter[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x004C0000, (void*)&g_fpcLf_Method, - (void*)0x000005E8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x026B0000, (void*)&l_daSwShutter_Method, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_SwallShutter = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_SwallShutter, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daSwShutter_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 619, // mPriority + &l_daSwShutter_Method, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 805990A0-805990C8 0000D8 0028+00 1/1 0/0 0/0 .data __vt__13daSwShutter_c */ @@ -411,7 +295,8 @@ asm daSwShutter_HIO_c::daSwShutter_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_sWallShutter/d_a_obj_sWallShutter/__dt__14mDoHIO_entry_cFv.s" } diff --git a/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita.cpp b/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita.cpp index 06fa1936db9..5a5ebb94b21 100644 --- a/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita.cpp +++ b/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita.cpp @@ -1,89 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_sakuita -// +/** + * @file d_a_obj_sakuita.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct Vec {}; - -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266B84 */ void operator*(f32) const; - /* 80266F48 */ void normalizeZP(); -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjSakuita_c { - /* 80CC46F8 */ void create_init(); - /* 80CC47F8 */ void initBaseMtx(); - /* 80CC4818 */ void setBaseMtx(); - /* 80CC489C */ void setPlatePos(); - /* 80CC4A98 */ void calcAngle(); - /* 80CC4C9C */ ~daObjSakuita_c(); - - static u8 const M_attr[44]; -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); -}; - -struct J3DModel {}; - -struct J3DModelData {}; - -struct dComIfG_play_c { - /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); - /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); - /* 8002CB68 */ void entrySimpleModel(J3DModel*, int); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80CC5008 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct cM3dGCyl { - /* 80CC4F78 */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80CC4FC0 */ ~cM3dGAab(); -}; - -struct cCcD_GStts { - /* 80CC5064 */ ~cCcD_GStts(); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; // // Forward References: @@ -139,11 +61,6 @@ extern "C" void cM_atan2s__Fff(); extern "C" void cM_rnd__Fv(); extern "C" void cLib_chaseF__FPfff(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSVECAdd(); -extern "C" void PSVECScale(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -363,25 +280,30 @@ static asm void daObjSakuita_Delete(daObjSakuita_c* param_0) { /* ############################################################################################## */ /* 80CC5130-80CC5150 -00001 0020+00 1/0 0/0 0/0 .data l_daObjSakuita_Method */ -SECTION_DATA static void* l_daObjSakuita_Method[8] = { - (void*)daObjSakuita_Create__FP10fopAc_ac_c, - (void*)daObjSakuita_Delete__FP14daObjSakuita_c, - (void*)daObjSakuita_Execute__FP14daObjSakuita_c, - (void*)daObjSakuita_IsDelete__FP14daObjSakuita_c, - (void*)daObjSakuita_Draw__FP14daObjSakuita_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjSakuita_Method = { + (process_method_func)daObjSakuita_Create__FP10fopAc_ac_c, + (process_method_func)daObjSakuita_Delete__FP14daObjSakuita_c, + (process_method_func)daObjSakuita_Execute__FP14daObjSakuita_c, + (process_method_func)daObjSakuita_IsDelete__FP14daObjSakuita_c, + (process_method_func)daObjSakuita_Draw__FP14daObjSakuita_c, }; /* 80CC5150-80CC5180 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Sakuita */ -SECTION_DATA extern void* g_profile_Obj_Sakuita[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01540000, (void*)&g_fpcLf_Method, - (void*)0x00000750, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00240000, (void*)&l_daObjSakuita_Method, - (void*)0x00040180, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Sakuita = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Sakuita, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjSakuita_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 36, // mPriority + &l_daObjSakuita_Method, // sub_method + 0x00040180, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CC5180-80CC518C 000054 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -437,7 +359,8 @@ static asm void daObjSakuita_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita/__dt__8cM3dGCylFv.s" } @@ -447,7 +370,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita/__dt__8cM3dGAabFv.s" } @@ -457,7 +381,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita/__dt__10dCcD_GSttsFv.s" } @@ -467,7 +392,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope.cpp b/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope.cpp index afe5ea26ff2..2497c0ed007 100644 --- a/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope.cpp +++ b/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope.cpp @@ -1,111 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_sakuita_rope -// +/** + * @file d_a_obj_sakuita_rope.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoExt_3DlineMat_c {}; - -struct mDoExt_3DlineMatSortPacket { - /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); -}; - -struct ResTIMG {}; - -struct _GXColor {}; - -struct dKy_tevstr_c {}; - -struct mDoExt_3DlineMat1_c { - /* 80013360 */ void init(u16, u16, ResTIMG*, int); - /* 80013FB0 */ void update(int, _GXColor&, dKy_tevstr_c*); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjItaRope_c { - /* 80CC57E4 */ void create_init(); - /* 80CC5E48 */ void initBaseMtx(); - /* 80CC5E7C */ void setBaseMtx(); - /* 80CC5ECC */ void setNormalRopePos(); - - static u8 const M_attr[20]; -}; - -struct Vec {}; - -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266B84 */ void operator*(f32) const; - /* 80266F48 */ void normalizeZP(); -}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); -}; - -struct J3DModel {}; - -struct J3DModelData {}; - -struct dComIfG_play_c { - /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); - /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); - /* 8002CB68 */ void entrySimpleModel(J3DModel*, int); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80CC6844 */ ~dCcD_GStts(); -}; - -struct cCcD_GStts { - /* 80CC68A0 */ ~cCcD_GStts(); -}; - -struct Sakuita_c { - /* 80CC5238 */ void setModelData(J3DModelData*); - /* 80CC527C */ void create(cXyz*, s16, s8); - /* 80CC5314 */ void execute(cXyz*, s16); - /* 80CC5354 */ void draw(); - /* 80CC5390 */ void initBaseMtx(); - /* 80CC53B0 */ void setBaseMtx(); - /* 80CC5444 */ void setPlatePos(cXyz*); - /* 80CC5720 */ void calcAngle(); - /* 80CC63E4 */ ~Sakuita_c(); - /* 80CC6420 */ Sakuita_c(); -}; - -struct RopeWork_c { - /* 80CC6424 */ ~RopeWork_c(); - /* 80CC6460 */ RopeWork_c(); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; // // Forward References: @@ -174,11 +74,6 @@ extern "C" void cLib_chaseF__FPfff(); extern "C" void cLib_targetAngleY__FPC3VecPC3Vec(); extern "C" void* __nwa__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSVECAdd(); -extern "C" void PSVECScale(); -extern "C" void PSVECSquareMag(); extern "C" void __destroy_new_array(); extern "C" void __construct_new_array(); extern "C" void _savegpr_26(); @@ -190,15 +85,11 @@ extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; // // Declarations: @@ -587,25 +478,30 @@ static bool daObjItaRope_IsDelete(daObjItaRope_c* param_0) { /* ############################################################################################## */ /* 80CC69A0-80CC69C0 -00001 0020+00 1/0 0/0 0/0 .data l_daObjItaRope_Method */ -SECTION_DATA static void* l_daObjItaRope_Method[8] = { - (void*)daObjItaRope_Create__FP10fopAc_ac_c, - (void*)daObjItaRope_Delete__FP14daObjItaRope_c, - (void*)daObjItaRope_Execute__FP14daObjItaRope_c, - (void*)daObjItaRope_IsDelete__FP14daObjItaRope_c, - (void*)daObjItaRope_Draw__FP14daObjItaRope_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjItaRope_Method = { + (process_method_func)daObjItaRope_Create__FP10fopAc_ac_c, + (process_method_func)daObjItaRope_Delete__FP14daObjItaRope_c, + (process_method_func)daObjItaRope_Execute__FP14daObjItaRope_c, + (process_method_func)daObjItaRope_IsDelete__FP14daObjItaRope_c, + (process_method_func)daObjItaRope_Draw__FP14daObjItaRope_c, }; /* 80CC69C0-80CC69F0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_ItaRope */ -SECTION_DATA extern void* g_profile_Obj_ItaRope[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01530000, (void*)&g_fpcLf_Method, - (void*)0x00000638, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00230000, (void*)&l_daObjItaRope_Method, - (void*)0x00040180, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_ItaRope = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_ItaRope, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjItaRope_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 35, // mPriority + &l_daObjItaRope_Method, // sub_method + 0x00040180, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CC69F0-80CC6A04 000058 0014+00 1/1 0/0 0/0 .data __vt__18mDoExt_3DlineMat_c */ @@ -652,7 +548,8 @@ static asm void daObjItaRope_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope/__dt__10dCcD_GSttsFv.s" } @@ -662,7 +559,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon.cpp b/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon.cpp index 3c42bd749af..b8bd3576fbc 100644 --- a/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon.cpp +++ b/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon.cpp @@ -1,258 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_scannon -// +/** + * @file d_a_obj_scannon.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct J3DAnmTextureSRTKey {}; - -struct J3DMaterialTable { - /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); -}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct JPABaseEmitter {}; - -struct daSCannon_c { - /* 80CC6B0C */ daSCannon_c(); - /* 80CC6C10 */ ~daSCannon_c(); - /* 80CC6D10 */ void create(); - /* 80CC7204 */ void execute(); - /* 80CC7228 */ void draw(); - /* 80CC747C */ void Delete(); - /* 80CC7508 */ void setModelMtx(); - /* 80CC7578 */ void setPtlModelMtx(); - /* 80CC7608 */ void createHeap(); - /* 80CC7970 */ void middleExe(); - /* 80CC7A10 */ void orderEvtInit(); - /* 80CC7AB8 */ void exeModeWait(); - /* 80CC7C48 */ void exeModeOrderEvt(); - /* 80CC7D14 */ void exeModeActionEvt(); - /* 80CC7EBC */ void exeModeEnd(); - /* 80CC7EC0 */ void demoExe(); - /* 80CC7FAC */ void demoModeInit(int); - /* 80CC8044 */ void demoInitLinkIn(); - /* 80CC8048 */ void demoExeLinkIn(); - /* 80CC8108 */ void demoInitSet(); - /* 80CC81DC */ void demoExeSet(); - /* 80CC8274 */ void demoInitMove(); - /* 80CC8278 */ void demoExeMove(); - /* 80CC8378 */ void demoInitFire(); - /* 80CC83CC */ void demoExeFire(); - /* 80CC8430 */ void demoInitFinish(); - /* 80CC8538 */ void demoExeFinish(); - /* 80CC8648 */ void demoInitWarpEndWait(); - /* 80CC8714 */ void demoExeWarpEndWait(); - /* 80CC8804 */ void demoInitWarpEndMove(); - /* 80CC8818 */ void demoExeWarpEndMove(); - /* 80CC88A8 */ void changeScene(); - /* 80CC8998 */ void init(); - /* 80CC8A30 */ void initEmtRt(u16, int, u16 const*, JPABaseEmitter**); - /* 80CC8B60 */ void exeEmtRt(u16, int, JPABaseEmitter**); - /* 80CC8BF4 */ void initEmtLine(); - /* 80CC8CDC */ void exeEmtLine(); - /* 80CC8DA0 */ void delEmtAll(); - /* 80CC8DDC */ void setCannonRepair(); - - static void* const s_demoTable[12]; - static u8 s_exeProc[48]; - static u8 s_demoExeProc_WarpEnd[48]; - static u8 s_demoExeProc_FireTks[72]; - static u8 s_demoExeProc_FireFirst[24]; - static u8 s_demoExeProc_FireSecond[96]; -}; - -struct cXyz {}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); - /* 8006FB10 */ void StartQuake(int, int, cXyz); - /* 8006FD94 */ void StopQuake(int); - /* 8006FE5C */ void CheckQuake(); -}; - -struct dSv_memBit_c { - /* 80034810 */ void onSwitch(int); - /* 80034838 */ void offSwitch(int); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); - /* 80042914 */ void setSkipProc(void*, int (*)(void*, int), int); -}; - -struct dEvent_manager_c { - /* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8); - /* 80047A78 */ void endCheck(s16); - /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int); - /* 80047D4C */ void getIsAddvance(int); - /* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int); - /* 800480EC */ void getMySubstanceP(int, char const*, int); - /* 8004817C */ void cutEnd(int); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dComIfG_play_c { - /* 8002C97C */ void getLayerNo(int); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80CC7124 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80CC7194 */ ~dBgS_AcchCir(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct camera_class {}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS_PolyInfo { - /* 80268074 */ cBgS_PolyInfo(); - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct _GXTexObj {}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JUTNameTab { - /* 802DEAF8 */ void getName(u16) const; -}; - -struct JGeometry { - template - struct TVec3 {}; - /* TVec3 */ - struct TVec3__template0 {}; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 8032842C */ void checkPass(f32); - /* 80CC6BC8 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -322,7 +76,6 @@ extern "C" u8 s_demoExeProc_FireSecond__11daSCannon_c[96]; // External References: // -SECTION_INIT void memset(); extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void scaleM__14mDoMtx_stack_cFfff(); extern "C" void play__14mDoExt_baseAnmFv(); @@ -393,8 +146,6 @@ extern "C" void getName__10JUTNameTabCFUs(); extern "C" void init__12J3DFrameCtrlFs(); extern "C" void checkPass__12J3DFrameCtrlFf(); extern "C" void removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_test(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_23(); @@ -409,15 +160,10 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void strcmp(); extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // @@ -766,25 +512,30 @@ SECTION_DATA u8 daSCannon_c::s_demoExeProc_FireSecond[96] = { }; /* 80CC9568-80CC9588 -00001 0020+00 1/0 0/0 0/0 .data daSCannon_METHODS */ -SECTION_DATA static void* daSCannon_METHODS[8] = { - (void*)daSCannon_create__FP11daSCannon_c, - (void*)daSCannon_Delete__FP11daSCannon_c, - (void*)daSCannon_execute__FP11daSCannon_c, - (void*)NULL, - (void*)daSCannon_draw__FP11daSCannon_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daSCannon_METHODS = { + (process_method_func)daSCannon_create__FP11daSCannon_c, + (process_method_func)daSCannon_Delete__FP11daSCannon_c, + (process_method_func)daSCannon_execute__FP11daSCannon_c, + 0, + (process_method_func)daSCannon_draw__FP11daSCannon_c, }; /* 80CC9588-80CC95B8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_SCannon */ -SECTION_DATA extern void* g_profile_Obj_SCannon[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x018C0000, (void*)&g_fpcLf_Method, - (void*)0x00000638, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02DE0000, (void*)&daSCannon_METHODS, - (void*)0x00044180, (void*)0x030E0000, +extern actor_process_profile_definition g_profile_Obj_SCannon = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_SCannon, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daSCannon_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 734, // mPriority + &daSCannon_METHODS, // sub_method + 0x00044180, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CC95B8-80CC95C4 0002B4 000C+00 2/2 0/0 0/0 .data __vt__12dBgS_AcchCir */ @@ -835,7 +586,8 @@ asm daSCannon_c::daSCannon_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon/__dt__12J3DFrameCtrlFv.s" } @@ -936,7 +688,8 @@ asm void daSCannon_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon/__dt__12dBgS_ObjAcchFv.s" } @@ -946,7 +699,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon/__dt__12dBgS_AcchCirFv.s" } diff --git a/rel/d/a/obj/d_a_obj_scannon_crs/d_a_obj_scannon_crs.cpp b/rel/d/a/obj/d_a_obj_scannon_crs/d_a_obj_scannon_crs.cpp index 03060f72680..ad46692a6e3 100644 --- a/rel/d/a/obj/d_a_obj_scannon_crs/d_a_obj_scannon_crs.cpp +++ b/rel/d/a/obj/d_a_obj_scannon_crs/d_a_obj_scannon_crs.cpp @@ -1,218 +1,14 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_scannon_crs -// +/** + * @file d_a_obj_scannon_crs.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_scannon_crs/d_a_obj_scannon_crs.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct J3DAnmTextureSRTKey {}; - -struct J3DMaterialTable { - /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); -}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daMidna_c {}; - -struct JPABaseEmitter {}; - -struct daSCannonCrs_c { - /* 80CC973C */ daSCannonCrs_c(); - /* 80CC983C */ ~daSCannonCrs_c(); - /* 80CC9910 */ void create(); - /* 80CC9B10 */ void Delete(); - /* 80CC9B80 */ void draw(); - /* 80CC9C64 */ void execute(); - /* 80CC9CA4 */ void middleExe(daMidna_c*); - /* 80CC9D60 */ void exeModeWait(daMidna_c*); - /* 80CC9F34 */ void exeModePreWait(daMidna_c*); - /* 80CC9F80 */ void exeModeOrderEvt(daMidna_c*); - /* 80CCA240 */ void exeModeTalkEvt(daMidna_c*); - /* 80CCA2CC */ void exeModeWarpEvt(daMidna_c*); - /* 80CCA344 */ void exeModeEnd(daMidna_c*); - /* 80CCA348 */ void demoExe(); - /* 80CCA74C */ void init(); - /* 80CCA848 */ void setModelMtx(); - /* 80CCA8CC */ void createHeap(); - /* 80CCAAC4 */ void chkInTalkRange(); - /* 80CCAB24 */ void initEmtRt(u16, int, u16 const*, JPABaseEmitter**); - /* 80CCAC48 */ void exeEmtRt(u16, int, JPABaseEmitter**); - /* 80CCACD0 */ void callMidnaBeamEmt(); - - static u8 s_exeProc[72]; -}; - -struct daPy_py_c { - static u8 m_midnaActor[4]; -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); - /* 8006FB10 */ void StartQuake(int, int, cXyz); - /* 8006FD94 */ void StopQuake(int); -}; - -struct dSv_memBit_c { - /* 80034810 */ void onSwitch(int); -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 8003498C */ void onEventBit(u16); - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dMsgFlow_c { - /* 80249F00 */ dMsgFlow_c(); - /* 80249F48 */ ~dMsgFlow_c(); - /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**); - /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int); - /* 8024A528 */ void getEventId(int*); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); - /* 80042914 */ void setSkipProc(void*, int (*)(void*, int), int); - /* 8004365C */ void setPt2(void*); -}; - -struct dEvent_manager_c { - /* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8); - /* 800479F8 */ void startCheck(s16); - /* 80047A78 */ void endCheck(s16); - /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int); - /* 80047D4C */ void getIsAddvance(int); - /* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int); - /* 8004817C */ void cutEnd(int); - /* 800483E8 */ void getRunEventName(); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct dAttHint_c { - /* 800738FC */ void request(fopAc_ac_c*, int); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; -struct JUTNameTab { - /* 802DEAF8 */ void getName(u16) const; -}; - -struct JGeometry { - template - struct TVec3 {}; - /* TVec3 */ - struct TVec3__template0 {}; -}; -struct J3DModel {}; -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 8032842C */ void checkPass(f32); - /* 80CC97F4 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -254,7 +50,6 @@ extern "C" u8 s_exeProc__14daSCannonCrs_c[72]; // External References: // -SECTION_INIT void memset(); extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoMtx_ZrotM__FPA4_fs(); @@ -319,11 +114,6 @@ extern "C" void getName__10JUTNameTabCFUs(); extern "C" void init__12J3DFrameCtrlFs(); extern "C" void checkPass__12J3DFrameCtrlFf(); extern "C" void removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECSquareMag(); -extern "C" void PSVECSquareDistance(); extern "C" void __ptmf_test(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_23(); @@ -336,16 +126,9 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void strcmp(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; extern "C" u8 m_midnaActor__9daPy_py_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -492,25 +275,30 @@ SECTION_DATA static void* CUT_TYPE_TABLE[4] = { }; /* 80CCB228-80CCB248 -00001 0020+00 1/0 0/0 0/0 .data daSCannonCrs_METHODS */ -SECTION_DATA static void* daSCannonCrs_METHODS[8] = { - (void*)daSCannonCrs_create__FP14daSCannonCrs_c, - (void*)daSCannonCrs_Delete__FP14daSCannonCrs_c, - (void*)daSCannonCrs_execute__FP14daSCannonCrs_c, - (void*)NULL, - (void*)daSCannonCrs_draw__FP14daSCannonCrs_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daSCannonCrs_METHODS = { + (process_method_func)daSCannonCrs_create__FP14daSCannonCrs_c, + (process_method_func)daSCannonCrs_Delete__FP14daSCannonCrs_c, + (process_method_func)daSCannonCrs_execute__FP14daSCannonCrs_c, + 0, + (process_method_func)daSCannonCrs_draw__FP14daSCannonCrs_c, }; /* 80CCB248-80CCB278 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_SCannonCrs */ -SECTION_DATA extern void* g_profile_Obj_SCannonCrs[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x018E0000, (void*)&g_fpcLf_Method, - (void*)0x00000674, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02E00000, (void*)&daSCannonCrs_METHODS, - (void*)0x00044180, (void*)0x030E0000, +extern actor_process_profile_definition g_profile_Obj_SCannonCrs = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_SCannonCrs, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daSCannonCrs_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 736, // mPriority + &daSCannonCrs_METHODS, // sub_method + 0x00044180, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CCB278-80CCB284 00011C 000C+00 2/2 0/0 0/0 .data __vt__14daSCannonCrs_c */ @@ -541,7 +329,8 @@ asm daSCannonCrs_c::daSCannonCrs_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_scannon_crs/d_a_obj_scannon_crs/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten.cpp b/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten.cpp index 666dbf3d78a..0be0c2cdc6f 100644 --- a/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten.cpp +++ b/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten.cpp @@ -1,220 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_scannon_ten -// +/** + * @file d_a_obj_scannon_ten.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjSCannonTen_c { - /* 80CCB364 */ daObjSCannonTen_c(); - /* 80CCB43C */ ~daObjSCannonTen_c(); - /* 80CCB4EC */ void createHeap(); - /* 80CCB66C */ void create(); - /* 80CCB9E0 */ void Delete(); - /* 80CCBA58 */ void draw(); - /* 80CCBB6C */ void execute(); - /* 80CCBB90 */ void middleExe(); - /* 80CCBC08 */ void exeModeWait(); - /* 80CCBCB0 */ void exeModeOrderEvt(); - /* 80CCBD4C */ void exeModeActionEvt(); - /* 80CCBDCC */ void exeModeEnd(); - /* 80CCBDD0 */ void demoExe(); - /* 80CCBE8C */ void demoModeInit(int); - /* 80CCBF00 */ void demoInitLinkIn(); - /* 80CCBF04 */ void demoExeLinkIn(); - /* 80CCBFC4 */ void demoInitSet(); - /* 80CCC088 */ void demoExeSet(); - /* 80CCC114 */ void demoInitMove(); - /* 80CCC118 */ void demoExeMove(); - /* 80CCC20C */ void demoInitFire(); - /* 80CCC260 */ void demoExeFire(); - /* 80CCC2B8 */ void demoInitFireEnd(); - /* 80CCC37C */ void demoExeFireEnd(); - /* 80CCC3D4 */ void demoInitFinish(); - /* 80CCC498 */ void demoExeFinish(); - /* 80CCC528 */ void init(); - /* 80CCC53C */ void setModelMtx(); - /* 80CCC5A0 */ void changeScene(); - /* 80CCC628 */ void initEmtSmoke(); - /* 80CCC74C */ void exeEmtSmoke(); - /* 80CCC7D0 */ void initEmtLine(); - /* 80CCC8B8 */ void exeEmtLine(); - /* 80CCC97C */ void delEmtAll(); - - static u8 s_exeProc[48]; - static u8 s_demoExeProc[144]; -}; - -struct cXyz {}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); - /* 8006FB10 */ void StartQuake(int, int, cXyz); - /* 8006FD94 */ void StopQuake(int); - /* 8006FE5C */ void CheckQuake(); -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); - /* 80042914 */ void setSkipProc(void*, int (*)(void*, int), int); -}; - -struct dEvent_manager_c { - /* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8); - /* 80047A78 */ void endCheck(s16); - /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int); - /* 80047D4C */ void getIsAddvance(int); - /* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int); - /* 800480EC */ void getMySubstanceP(int, char const*, int); - /* 8004817C */ void cutEnd(int); -}; -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80CCB900 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80CCB970 */ ~dBgS_AcchCir(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct camera_class {}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS_PolyInfo { - /* 80268074 */ cBgS_PolyInfo(); - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct _GXTexObj {}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JUTNameTab { - /* 802DEAF8 */ void getName(u16) const; -}; - -struct JGeometry { - template - struct TVec3 {}; - /* TVec3 */ - struct TVec3__template0 {}; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 8032842C */ void checkPass(f32); - /* 80CCB3F4 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -275,7 +67,6 @@ extern "C" u8 s_demoExeProc__17daObjSCannonTen_c[144]; // External References: // -SECTION_INIT void memset(); extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void play__14mDoExt_baseAnmFv(); extern "C" void init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb(); @@ -336,8 +127,6 @@ extern "C" void __dl__FPv(); extern "C" void getName__10JUTNameTabCFUs(); extern "C" void init__12J3DFrameCtrlFs(); extern "C" void checkPass__12J3DFrameCtrlFf(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_test(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_24(); @@ -348,14 +137,9 @@ extern "C" void _restgpr_24(); extern "C" void _restgpr_25(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void strcmp(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // @@ -617,25 +401,30 @@ SECTION_DATA static void* CUT_TYPE_TABLE_FIRE_SECOND[6] = { }; /* 80CCCE94-80CCCEB4 -00001 0020+00 1/0 0/0 0/0 .data daObjSCannonTen_METHODS */ -SECTION_DATA static void* daObjSCannonTen_METHODS[8] = { - (void*)daObjSCannonTen_create__FP17daObjSCannonTen_c, - (void*)daObjSCannonTen_Delete__FP17daObjSCannonTen_c, - (void*)daObjSCannonTen_execute__FP17daObjSCannonTen_c, - (void*)NULL, - (void*)daObjSCannonTen_draw__FP17daObjSCannonTen_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjSCannonTen_METHODS = { + (process_method_func)daObjSCannonTen_create__FP17daObjSCannonTen_c, + (process_method_func)daObjSCannonTen_Delete__FP17daObjSCannonTen_c, + (process_method_func)daObjSCannonTen_execute__FP17daObjSCannonTen_c, + 0, + (process_method_func)daObjSCannonTen_draw__FP17daObjSCannonTen_c, }; /* 80CCCEB4-80CCCEE4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_SCannonTen */ -SECTION_DATA extern void* g_profile_Obj_SCannonTen[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01A50000, (void*)&g_fpcLf_Method, - (void*)0x00000604, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02EA0000, (void*)&daObjSCannonTen_METHODS, - (void*)0x00040180, (void*)0x030E0000, +extern actor_process_profile_definition g_profile_Obj_SCannonTen = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_SCannonTen, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjSCannonTen_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 746, // mPriority + &daObjSCannonTen_METHODS, // sub_method + 0x00040180, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CCCEE4-80CCCEF0 000214 000C+00 2/2 0/0 0/0 .data __vt__12dBgS_AcchCir */ @@ -686,7 +475,8 @@ asm daObjSCannonTen_c::daObjSCannonTen_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten/__dt__12J3DFrameCtrlFv.s" } @@ -759,7 +549,8 @@ asm void daObjSCannonTen_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten/__dt__12dBgS_ObjAcchFv.s" } @@ -769,7 +560,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten/__dt__12dBgS_AcchCirFv.s" } diff --git a/rel/d/a/obj/d_a_obj_sekidoor/d_a_obj_sekidoor.cpp b/rel/d/a/obj/d_a_obj_sekidoor/d_a_obj_sekidoor.cpp index 0f4ed12df9e..f625e823b8f 100644 --- a/rel/d/a/obj/d_a_obj_sekidoor/d_a_obj_sekidoor.cpp +++ b/rel/d/a/obj/d_a_obj_sekidoor/d_a_obj_sekidoor.cpp @@ -1,119 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_sekidoor -// +/** + * @file d_a_obj_sekidoor.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_sekidoor/d_a_obj_sekidoor.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObj_SekiDoor_c { - /* 80CCD02C */ void create(); - /* 80CCD154 */ void CreateHeap(); - /* 80CCD1F0 */ void Create(); - /* 80CCD23C */ void Delete(); - /* 80CCD290 */ void Execute(f32 (**)[3][4]); - /* 80CCD538 */ void Draw(); - /* 80CCD5DC */ void evtSkip(); - /* 80CCD64C */ void setPrtcls(); - /* 80CCD810 */ void initBaseMtx(); - /* 80CCD84C */ void setBaseMtx(); -}; - -struct daObj_SekiDoor_Param_c { - /* 80CCD9AC */ ~daObj_SekiDoor_Param_c(); - - static u8 const m[1 + 3 /* padding */]; -}; - -struct cXyz {}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); - /* 8006FD94 */ void StopQuake(int); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -175,18 +68,11 @@ extern "C" void cLib_chaseF__FPfff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void _savegpr_24(); extern "C" void _restgpr_24(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -240,25 +126,30 @@ SECTION_DATA static void* l_resNameList[2] = { }; /* 80CCDA74-80CCDA94 -00001 0020+00 1/0 0/0 0/0 .data daObj_SekiDoor_MethodTable */ -SECTION_DATA static void* daObj_SekiDoor_MethodTable[8] = { - (void*)daObj_SekiDoor_Create__FPv, - (void*)daObj_SekiDoor_Delete__FPv, - (void*)daObj_SekiDoor_Execute__FPv, - (void*)daObj_SekiDoor_IsDelete__FPv, - (void*)daObj_SekiDoor_Draw__FPv, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObj_SekiDoor_MethodTable = { + (process_method_func)daObj_SekiDoor_Create__FPv, + (process_method_func)daObj_SekiDoor_Delete__FPv, + (process_method_func)daObj_SekiDoor_Execute__FPv, + (process_method_func)daObj_SekiDoor_IsDelete__FPv, + (process_method_func)daObj_SekiDoor_Draw__FPv, }; /* 80CCDA94-80CCDAC4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_SEKIDOOR */ -SECTION_DATA extern void* g_profile_OBJ_SEKIDOOR[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01320000, (void*)&g_fpcLf_Method, - (void*)0x000005D8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00570000, (void*)&daObj_SekiDoor_MethodTable, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_SEKIDOOR = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_SEKIDOOR, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObj_SekiDoor_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 87, // mPriority + &daObj_SekiDoor_MethodTable, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CCDAC4-80CCDAEC 000088 0028+00 1/1 0/0 0/0 .data __vt__16daObj_SekiDoor_c */ diff --git a/rel/d/a/obj/d_a_obj_shield/d_a_obj_shield.cpp b/rel/d/a/obj/d_a_obj_shield/d_a_obj_shield.cpp index 089afea313d..d114da1f005 100644 --- a/rel/d/a/obj/d_a_obj_shield/d_a_obj_shield.cpp +++ b/rel/d/a/obj/d_a_obj_shield/d_a_obj_shield.cpp @@ -1,147 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_shield -// +/** + * @file d_a_obj_shield.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_shield/d_a_obj_shield.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static f32 mGroundY; -}; - -struct daPy_py_c { - /* 8015F4F0 */ void setLookPos(cXyz*); -}; - -struct daItemShield_c { - /* 80CD6D9C */ void initBaseMtx(); - /* 80CD6DD8 */ void setBaseMtx(); - /* 80CD7094 */ void Create(); - /* 80CD724C */ bool __CreateHeap(); - /* 80CD7254 */ void create(); - /* 80CD75EC */ void bg_check(); - /* 80CD7734 */ void action_proc_call(); - /* 80CD77F0 */ void actionInit(); - /* 80CD7828 */ void actionWaitInit(); - /* 80CD7890 */ void actionWait(); - /* 80CD7C68 */ void initActionOrderGetDemo(); - /* 80CD7D04 */ void actionOrderGetDemo(); - /* 80CD7D80 */ void actionGetDemo(); - /* 80CD7E00 */ void event_proc_call(); - /* 80CD7EBC */ void actionWaitCamDemo(); - /* 80CD7F20 */ void actionOrderCamDemo(); - /* 80CD7F88 */ void actionCamDemo(); - /* 80CD7FE4 */ void actionCamDemoEnd(); - /* 80CD7FE8 */ void execute(); - /* 80CD80EC */ void draw(); - /* 80CD8140 */ void _delete(); -}; - -struct daItemBase_c { - /* 80037A64 */ void hide(); - /* 80037A74 */ void show(); - /* 80037ACC */ void chkDraw(); - /* 80144724 */ void DeleteBase(char const*); - /* 8014474C */ bool clothCreate(); - /* 80144B94 */ void DrawBase(); - /* 80144C30 */ void RotateYBase(); - /* 80144C7C */ void setListStart(); - /* 80144CC4 */ void settingBeforeDraw(); - /* 80144D18 */ void setTevStr(); - /* 80144D70 */ void setShadow(); - /* 80144EDC */ void animEntry(); - /* 80145144 */ void chkFlag(int); - /* 80145164 */ void getTevFrm(); - /* 80145180 */ void getBtpFrm(); - /* 8014519C */ void getShadowSize(); - /* 801451B4 */ void getCollisionH(); - /* 801451D0 */ void getCollisionR(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dItem_data { - static void* field_item_res[1020]; - static u8 item_info[1020 + 4 /* padding */]; -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dEvent_manager_c { - /* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8); - /* 80047A78 */ void endCheck(s16); - /* 80047ADC */ void endCheckOld(char const*); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80CD757C */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80CD750C */ ~dBgS_AcchCir(); -}; - -struct csXyz {}; - -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct cBgS { - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; // // Forward References: @@ -255,13 +120,9 @@ extern "C" void SetR__8cM3dGCylFf(); extern "C" void cLib_addCalcAngleS__FPsssss(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" void* field_item_res__10dItem_data[1020]; @@ -455,25 +316,30 @@ SECTION_DATA static u8 l_func[48] = { #pragma pop /* 80CD841C-80CD843C -00001 0020+00 1/0 0/0 0/0 .data l_daItemShield_Method */ -SECTION_DATA static void* l_daItemShield_Method[8] = { - (void*)daItemShield_Create__FP10fopAc_ac_c, - (void*)daItemShield_Delete__FP14daItemShield_c, - (void*)daItemShield_Execute__FP14daItemShield_c, - (void*)NULL, - (void*)daItemShield_Draw__FP14daItemShield_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daItemShield_Method = { + (process_method_func)daItemShield_Create__FP10fopAc_ac_c, + (process_method_func)daItemShield_Delete__FP14daItemShield_c, + (process_method_func)daItemShield_Execute__FP14daItemShield_c, + 0, + (process_method_func)daItemShield_Draw__FP14daItemShield_c, }; /* 80CD843C-80CD846C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Shield */ -SECTION_DATA extern void* g_profile_Obj_Shield[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x021C0000, (void*)&g_fpcLf_Method, - (void*)0x00000958, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00F00000, (void*)&l_daItemShield_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Shield = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Shield, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daItemShield_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 240, // mPriority + &l_daItemShield_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CD846C-80CD8478 000130 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ @@ -738,7 +604,8 @@ extern "C" asm void __dt__10dCcD_GSttsFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_shield/d_a_obj_shield/__dt__12dBgS_AcchCirFv.s" } @@ -748,7 +615,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_shield/d_a_obj_shield/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_sm_door/d_a_obj_sm_door.cpp b/rel/d/a/obj/d_a_obj_sm_door/d_a_obj_sm_door.cpp index 59ebbc67a62..70e35ca3d74 100644 --- a/rel/d/a/obj/d_a_obj_sm_door/d_a_obj_sm_door.cpp +++ b/rel/d/a/obj/d_a_obj_sm_door/d_a_obj_sm_door.cpp @@ -1,137 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_sm_door -// +/** + * @file d_a_obj_sm_door.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_sm_door/d_a_obj_sm_door.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static f32 mGroundY; -}; - -struct daObjSM_DOOR_c { - /* 80CD8784 */ void ChangeModel(); - /* 80CD8790 */ void Action(); - /* 80CD8A40 */ void SetDzb(); - /* 80CD8A90 */ void ReleaceDzb(); - /* 80CD8AF8 */ void DrawChk1(); - /* 80CD8BBC */ void DrawChk2(); - /* 80CD8C80 */ void setBaseMtx(); - /* 80CD8D4C */ void create(); - /* 80CD90A4 */ void CreateHeap(); - /* 80CD9258 */ void Create(); - /* 80CD929C */ void Execute(f32 (**)[3][4]); - /* 80CD930C */ void Draw(); - /* 80CD9544 */ void Delete(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C6B8 */ void getObjectResName2Index(char const*, char const*); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); -}; - -struct dBgW_Base {}; - -struct dBgW {}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80CD902C */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -200,21 +74,14 @@ extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP extern "C" void ChkUsed__9cBgW_BgIdCFv(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSVECSquareDistance(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -486,25 +353,30 @@ SECTION_DEAD static char const* const stringBase_80CD960B = "A_SM_DoorWo.dzb"; SECTION_DATA static void* l_arcName = (void*)&d_a_obj_sm_door__stringBase0; /* 80CD9690-80CD96B0 -00001 0020+00 1/0 0/0 0/0 .data l_daObjSM_DOOR_Method */ -SECTION_DATA static void* l_daObjSM_DOOR_Method[8] = { - (void*)daObjSM_DOOR_Create__FP10fopAc_ac_c, - (void*)daObjSM_DOOR_Delete__FP14daObjSM_DOOR_c, - (void*)daObjSM_DOOR_Execute__FP14daObjSM_DOOR_c, - (void*)daObjSM_DOOR_IsDelete__FP14daObjSM_DOOR_c, - (void*)daObjSM_DOOR_Draw__FP14daObjSM_DOOR_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjSM_DOOR_Method = { + (process_method_func)daObjSM_DOOR_Create__FP10fopAc_ac_c, + (process_method_func)daObjSM_DOOR_Delete__FP14daObjSM_DOOR_c, + (process_method_func)daObjSM_DOOR_Execute__FP14daObjSM_DOOR_c, + (process_method_func)daObjSM_DOOR_IsDelete__FP14daObjSM_DOOR_c, + (process_method_func)daObjSM_DOOR_Draw__FP14daObjSM_DOOR_c, }; /* 80CD96B0-80CD96E0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_SM_DOOR */ -SECTION_DATA extern void* g_profile_Obj_SM_DOOR[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x012B0000, (void*)&g_fpcLf_Method, - (void*)0x00000858, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01DC0000, (void*)&l_daObjSM_DOOR_Method, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_SM_DOOR = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_SM_DOOR, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjSM_DOOR_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 476, // mPriority + &l_daObjSM_DOOR_Method, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CD96E0-80CD9704 000054 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ @@ -548,7 +420,8 @@ asm void daObjSM_DOOR_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_sm_door/d_a_obj_sm_door/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_smallkey/d_a_obj_smallkey.cpp b/rel/d/a/obj/d_a_obj_smallkey/d_a_obj_smallkey.cpp index 732384e6a08..b7ec728be98 100644 --- a/rel/d/a/obj/d_a_obj_smallkey/d_a_obj_smallkey.cpp +++ b/rel/d/a/obj/d_a_obj_smallkey/d_a_obj_smallkey.cpp @@ -1039,25 +1039,29 @@ extern "C" asm void __dt__18dPa_levelEcallBackFv() { /* 80CDB7B0-80CDB7B4 002070 0004+00 1/0 0/0 0/0 .text * execute__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::execute(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::execute(JPABaseEmitter* param_0) { +extern "C" asm void execute__18JPAEmitterCallBackFP14JPABaseEmitter() { /* empty function */ } /* 80CDB7B4-80CDB7B8 002074 0004+00 1/0 0/0 0/0 .text * executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::executeAfter(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::executeAfter(JPABaseEmitter* param_0) { +extern "C" asm void executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter() { /* empty function */ } /* 80CDB7B8-80CDB7BC 002078 0004+00 1/0 0/0 0/0 .text draw__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::draw(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::draw(JPABaseEmitter* param_0) { +extern "C" asm void draw__18JPAEmitterCallBackFP14JPABaseEmitter() { /* empty function */ } /* 80CDB7BC-80CDB7C0 00207C 0004+00 1/0 0/0 0/0 .text * drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::drawAfter(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::drawAfter(JPABaseEmitter* param_0) { +extern "C" asm void drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter() { /* empty function */ } diff --git a/rel/d/a/obj/d_a_obj_smgdoor/d_a_obj_smgdoor.cpp b/rel/d/a/obj/d_a_obj_smgdoor/d_a_obj_smgdoor.cpp index c2680c35c01..513499e6e03 100644 --- a/rel/d/a/obj/d_a_obj_smgdoor/d_a_obj_smgdoor.cpp +++ b/rel/d/a/obj/d_a_obj_smgdoor/d_a_obj_smgdoor.cpp @@ -1,135 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_smgdoor -// +/** + * @file d_a_obj_smgdoor.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_smgdoor/d_a_obj_smgdoor.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266EF4 */ void normalize(); -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CDD4 */ void transM(cXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjSmgDoor_c { - /* 80CDBB5C */ void initBaseMtx(); - /* 80CDBBEC */ void setBaseMtx(); - /* 80CDBD38 */ void Create(); - /* 80CDBE1C */ void CreateHeap(); - /* 80CDBED4 */ void create1st(); - /* 80CDBFA4 */ void Execute(f32 (**)[3][4]); - /* 80CDBFF0 */ void getDemoAction(); - /* 80CDC038 */ void demoProc(); - /* 80CDC248 */ void openInit(); - /* 80CDC378 */ void openProc(); - /* 80CDC4AC */ void setGoal(); - /* 80CDC548 */ void setPos(); - /* 80CDC610 */ void sceneChange(); - /* 80CDC65C */ void event_proc_call(); - /* 80CDC700 */ void actionWaitEvent(); - /* 80CDC790 */ void actionEvent(); - /* 80CDC7F4 */ void actionDead(); - /* 80CDC7F8 */ void checkArea(); - /* 80CDC974 */ void checkOpen(); - /* 80CDCA00 */ void Draw(); - /* 80CDCAC4 */ void Delete(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C6B8 */ void getObjectResName2Index(char const*, char const*); -}; - -struct dEvt_control_c { - /* 80042914 */ void setSkipProc(void*, int (*)(void*, int), int); -}; - -struct dEvent_manager_c { - /* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8); - /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int); - /* 80047D4C */ void getIsAddvance(int); - /* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int); - /* 800480EC */ void getMySubstanceP(int, char const*, int); - /* 8004817C */ void cutEnd(int); - /* 800483C4 */ void setGoal(cXyz*); -}; - -struct dBgW_Base {}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -206,22 +82,14 @@ extern "C" void normalize__4cXyzFv(); extern "C" void ChkUsed__9cBgW_BgIdCFv(); extern "C" void cLib_chaseS__FPsss(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECSquareMag(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_27(); extern "C" void _savegpr_29(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); -extern "C" void abs(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_80CDCDF8[4]; @@ -665,25 +533,30 @@ asm void daObjSmgDoor_c::Delete() { /* ############################################################################################## */ /* 80CDCD7C-80CDCD9C -00001 0020+00 1/0 0/0 0/0 .data daObjSmgDoor_METHODS */ -SECTION_DATA static void* daObjSmgDoor_METHODS[8] = { - (void*)daObjSmgDoor_create1st__FP14daObjSmgDoor_c, - (void*)daObjSmgDoor_MoveBGDelete__FP14daObjSmgDoor_c, - (void*)daObjSmgDoor_MoveBGExecute__FP14daObjSmgDoor_c, - (void*)NULL, - (void*)daObjSmgDoor_MoveBGDraw__FP14daObjSmgDoor_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjSmgDoor_METHODS = { + (process_method_func)daObjSmgDoor_create1st__FP14daObjSmgDoor_c, + (process_method_func)daObjSmgDoor_MoveBGDelete__FP14daObjSmgDoor_c, + (process_method_func)daObjSmgDoor_MoveBGExecute__FP14daObjSmgDoor_c, + 0, + (process_method_func)daObjSmgDoor_MoveBGDraw__FP14daObjSmgDoor_c, }; /* 80CDCD9C-80CDCDCC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_SmgDoor */ -SECTION_DATA extern void* g_profile_Obj_SmgDoor[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00AB0000, (void*)&g_fpcLf_Method, - (void*)0x000005F4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02290000, (void*)&daObjSmgDoor_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_SmgDoor = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_SmgDoor, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjSmgDoor_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 553, // mPriority + &daObjSmgDoor_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CDCDCC-80CDCDF4 000108 0028+00 1/1 0/0 0/0 .data __vt__14daObjSmgDoor_c */ diff --git a/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.cpp b/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.cpp index a1f8372c205..ea150983781 100644 --- a/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.cpp +++ b/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.cpp @@ -1,127 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_smtile -// +/** + * @file d_a_obj_smtile.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct Vec {}; - -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; - /* 80CDD3AC */ ~cXyz(); - /* 80CDD580 */ cXyz(); -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct J3DAnmTevRegKey {}; - -struct J3DMaterialTable { - /* 8032F880 */ void removeTevRegAnimator(J3DAnmTevRegKey*); -}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObj_SMTile_c { - /* 80CDD2AC */ ~daObj_SMTile_c(); - /* 80CDD3E8 */ void create(); - /* 80CDD5CC */ void CreateHeap(); - /* 80CDD6E8 */ void Delete(); - /* 80CDD71C */ void Execute(); - /* 80CDDA98 */ void Draw(); - /* 80CDDB28 */ void createHeapCallBack(fopAc_ac_c*); - /* 80CDDB48 */ void setDstPos(); - /* 80CDDD28 */ void setPrtcls(int, int); - /* 80CDDEFC */ void touchPrtcls(f32); - /* 80CDE1A8 */ void setMtx(); -}; - -struct daObj_SMTile_Param_c { - /* 80CDE300 */ ~daObj_SMTile_Param_c(); - - static u8 const m[8]; -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80CDD584 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -184,8 +69,6 @@ extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); extern "C" void removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void _savegpr_20(); @@ -198,11 +81,8 @@ extern "C" void _restgpr_22(); extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -241,25 +121,30 @@ SECTION_DATA static u8 l_tileMoveData[84] = { }; /* 80CDE3F8-80CDE418 -00001 0020+00 1/0 0/0 0/0 .data daObj_SMTile_MethodTable */ -SECTION_DATA static void* daObj_SMTile_MethodTable[8] = { - (void*)daObj_SMTile_Create__FPv, - (void*)daObj_SMTile_Delete__FPv, - (void*)daObj_SMTile_Execute__FPv, - (void*)daObj_SMTile_IsDelete__FPv, - (void*)daObj_SMTile_Draw__FPv, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObj_SMTile_MethodTable = { + (process_method_func)daObj_SMTile_Create__FPv, + (process_method_func)daObj_SMTile_Delete__FPv, + (process_method_func)daObj_SMTile_Execute__FPv, + (process_method_func)daObj_SMTile_IsDelete__FPv, + (process_method_func)daObj_SMTile_Draw__FPv, }; /* 80CDE418-80CDE448 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_SMTILE */ -SECTION_DATA extern void* g_profile_OBJ_SMTILE[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01340000, (void*)&g_fpcLf_Method, - (void*)0x00000B30, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00590000, (void*)&daObj_SMTile_MethodTable, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_SMTILE = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_SMTILE, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObj_SMTile_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 89, // mPriority + &daObj_SMTile_MethodTable, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CDE448-80CDE454 0000B4 000C+00 3/3 0/0 0/0 .data __vt__12J3DFrameCtrl */ @@ -290,7 +175,8 @@ asm daObj_SMTile_c::~daObj_SMTile_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile/__dt__4cXyzFv.s" } @@ -307,7 +193,8 @@ asm void daObj_SMTile_c::create() { #pragma pop /* 80CDD580-80CDD584 0003C0 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */ -cXyz::cXyz() { +// cXyz::cXyz() { +extern "C" asm void __ct__4cXyzFv() { /* empty function */ } @@ -315,7 +202,8 @@ cXyz::cXyz() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_smw_stone/d_a_obj_smw_stone.cpp b/rel/d/a/obj/d_a_obj_smw_stone/d_a_obj_smw_stone.cpp index 1ad8732ec7e..eb839f4322f 100644 --- a/rel/d/a/obj/d_a_obj_smw_stone/d_a_obj_smw_stone.cpp +++ b/rel/d/a/obj/d_a_obj_smw_stone/d_a_obj_smw_stone.cpp @@ -1,131 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_smw_stone -// +/** + * @file d_a_obj_smw_stone.cpp + * +*/ -// #include "rel/d/a/obj/d_a_obj_smw_stone/d_a_obj_smw_stone.h" +#include "rel/d/a/obj/d_a_obj_smw_stone/d_a_obj_smw_stone.h" #include "dolphin/types.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daSmWStone_c { - /* 80CDE538 */ daSmWStone_c(); - /* 80CDE588 */ ~daSmWStone_c(); - /* 80CDE614 */ void create(); - /* 80CDE8D8 */ void execute(); - /* 80CDE92C */ void draw(); - /* 80CDEA2C */ void Delete(); - /* 80CDEAA4 */ void exeModeHowl(); - /* 80CDEBA0 */ void setModelMtx(); - /* 80CDEC04 */ void createHeap(); - /* 80CDED30 */ void init(); - /* 80CDED9C */ void chkWlfInRange(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80CDE7F8 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80CDE868 */ ~dBgS_AcchCir(); -}; - -struct csXyz {}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS_PolyInfo { - /* 80268074 */ cBgS_PolyInfo(); - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct _GXTexObj {}; - -struct Vec {}; - -struct Z2WolfHowlMgr { - /* 802CB6EC */ void startWindStoneSound(s8, Vec*); -}; - -struct J3DModel {}; // // Forward References: @@ -189,20 +71,13 @@ extern "C" void __dt__8cM3dGCirFv(); extern "C" void startWindStoneSound__13Z2WolfHowlMgrFScP3Vec(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSVECSquareDistance(); extern "C" void _savegpr_26(); extern "C" void _savegpr_29(); extern "C" void _restgpr_26(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; // // Declarations: @@ -229,25 +104,30 @@ SECTION_DEAD static char const* const stringBase_80CDEF14 = "WStoneF"; SECTION_DATA static void* l_arcName = (void*)&d_a_obj_smw_stone__stringBase0; /* 80CDEF20-80CDEF40 -00001 0020+00 1/0 0/0 0/0 .data daSmWStone_METHODS */ -SECTION_DATA static void* daSmWStone_METHODS[8] = { - (void*)daSmWStone_create__FP12daSmWStone_c, - (void*)daSmWStone_Delete__FP12daSmWStone_c, - (void*)daSmWStone_execute__FP12daSmWStone_c, - (void*)NULL, - (void*)daSmWStone_draw__FP12daSmWStone_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daSmWStone_METHODS = { + (process_method_func)daSmWStone_create__FP12daSmWStone_c, + (process_method_func)daSmWStone_Delete__FP12daSmWStone_c, + (process_method_func)daSmWStone_execute__FP12daSmWStone_c, + 0, + (process_method_func)daSmWStone_draw__FP12daSmWStone_c, }; /* 80CDEF40-80CDEF70 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_SmWStone */ -SECTION_DATA extern void* g_profile_Obj_SmWStone[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x018D0000, (void*)&g_fpcLf_Method, - (void*)0x000005C8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02DF0000, (void*)&daSmWStone_METHODS, - (void*)0x00044100, (void*)0x03000000, +extern actor_process_profile_definition g_profile_Obj_SmWStone = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_SmWStone, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daSmWStone_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 735, // mPriority + &daSmWStone_METHODS, // sub_method + 0x00044100, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_0_e, // cullType }; /* 80CDEF70-80CDEF7C 000054 000C+00 2/2 0/0 0/0 .data __vt__12dBgS_AcchCir */ @@ -331,7 +211,8 @@ asm void daSmWStone_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_smw_stone/d_a_obj_smw_stone/__dt__12dBgS_ObjAcchFv.s" } @@ -341,7 +222,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_smw_stone/d_a_obj_smw_stone/__dt__12dBgS_AcchCirFv.s" } diff --git a/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp b/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp index d8af7b8d9af..e60eff851a2 100644 --- a/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp +++ b/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_snow_soup -// +/** + * @file d_a_obj_snow_soup.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.h" #include "d/com/d_com_inf_game.h" diff --git a/rel/d/a/obj/d_a_obj_so/d_a_obj_so.cpp b/rel/d/a/obj/d_a_obj_so/d_a_obj_so.cpp index 889412ff81b..16703eeab71 100644 --- a/rel/d/a/obj/d_a_obj_so/d_a_obj_so.cpp +++ b/rel/d/a/obj/d_a_obj_so/d_a_obj_so.cpp @@ -1,166 +1,14 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_so -// +/** + * @file d_a_obj_so.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_so/d_a_obj_so.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" +#include "d/d_camera.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_so_class {}; - -struct mDoMtx_stack_c { - /* 8000CCC8 */ void push(); - /* 8000CD14 */ void pop(); - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObj_So_HIO_c { - /* 80CE03CC */ daObj_So_HIO_c(); - /* 80CE3928 */ ~daObj_So_HIO_c(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz { - /* 80CE3920 */ csXyz(); - /* 802673F4 */ csXyz(s16, s16, s16); - /* 80CE0F58 */ ~csXyz(); -}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B8B4 */ void forceOnEventMove(u32); - }; - - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dCcU_AtInfo {}; - -struct dCamera_c { - /* 801614D0 */ void Stop(); - /* 8016300C */ void SetTrimSize(s32); - /* 80180B40 */ void Set(cXyz, cXyz, s16, f32); -}; - -struct dBgW_Base {}; -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjGndChk { - /* 80CE2A64 */ ~dBgS_ObjGndChk(); -}; - -struct dBgS_ObjAcch { - /* 80CE38B0 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS_PolyInfo {}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); - /* 800744A0 */ void GroundCross(cBgS_GndChk*); -}; - -struct Z2SeqMgr { - /* 802B4164 */ void setBattleBgmOff(bool); -}; - -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); - /* 802C06F4 */ void stopAnime(); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -291,9 +139,6 @@ extern "C" void init__10Z2CreatureFP3VecP3VecUcUc(); extern "C" void stopAnime__10Z2CreatureFv(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void __construct_array(); extern "C" void _savegpr_14(); extern "C" void _savegpr_18(); @@ -307,8 +152,6 @@ extern "C" void _restgpr_23(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -316,9 +159,7 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -360,25 +201,30 @@ static dCcD_SrcCyl cc_cyl_src = { }; /* 80CE3BBC-80CE3BDC -00001 0020+00 1/0 0/0 0/0 .data l_daObj_So_Method */ -SECTION_DATA static void* l_daObj_So_Method[8] = { - (void*)daObj_So_Create__FP10fopAc_ac_c, - (void*)daObj_So_Delete__FP12obj_so_class, - (void*)daObj_So_Execute__FP12obj_so_class, - (void*)daObj_So_IsDelete__FP12obj_so_class, - (void*)daObj_So_Draw__FP12obj_so_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObj_So_Method = { + (process_method_func)daObj_So_Create__FP10fopAc_ac_c, + (process_method_func)daObj_So_Delete__FP12obj_so_class, + (process_method_func)daObj_So_Execute__FP12obj_so_class, + (process_method_func)daObj_So_IsDelete__FP12obj_so_class, + (process_method_func)daObj_So_Draw__FP12obj_so_class, }; /* 80CE3BDC-80CE3C0C -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_SO */ -SECTION_DATA extern void* g_profile_OBJ_SO[12] = { - (void*)0xFFFFFFFD, (void*)0x0002FFFD, - (void*)0x001C0000, (void*)&g_fpcLf_Method, - (void*)0x00001BD0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00370000, (void*)&l_daObj_So_Method, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_SO = { + fpcLy_CURRENT_e, // mLayerID + 2, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_SO, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(obj_so_class), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 55, // mPriority + &l_daObj_So_Method, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CE3C0C-80CE3C18 00009C 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */ @@ -729,7 +575,8 @@ static asm void so_drop(obj_so_class* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm csXyz::~csXyz() { +// asm csXyz::~csXyz() { +extern "C" asm void __dt__5csXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_so/d_a_obj_so/__dt__5csXyzFv.s" } @@ -1030,7 +877,8 @@ static asm void part_move(obj_so_class* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +// asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +extern "C" asm void __dt__14dBgS_ObjGndChkFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_so/d_a_obj_so/__dt__14dBgS_ObjGndChkFv.s" } @@ -1343,14 +1191,16 @@ extern "C" asm void __dt__8cM3dGAabFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_so/d_a_obj_so/__dt__12dBgS_ObjAcchFv.s" } #pragma pop /* 80CE3920-80CE3924 003640 0004+00 1/1 0/0 0/0 .text __ct__5csXyzFv */ -csXyz::csXyz() { +// csXyz::csXyz() { +extern "C" asm void __ct__5csXyzFv() { /* empty function */ } diff --git a/rel/d/a/obj/d_a_obj_spinLift/d_a_obj_spinLift.cpp b/rel/d/a/obj/d_a_obj_spinLift/d_a_obj_spinLift.cpp index d81c75922b2..fefcd07c4f5 100644 --- a/rel/d/a/obj/d_a_obj_spinLift/d_a_obj_spinLift.cpp +++ b/rel/d/a/obj/d_a_obj_spinLift/d_a_obj_spinLift.cpp @@ -1,120 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_spinLift -// +/** + * @file d_a_obj_spinLift.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_spinLift/d_a_obj_spinLift.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80CE3DE4 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct daSpinLift_c { - /* 80CE3E2C */ void setBaseMtx(); - /* 80CE3E9C */ void CreateHeap(); - /* 80CE3F1C */ void create(); - /* 80CE40FC */ void Execute(f32 (**)[3][4]); - /* 80CE414C */ void moveLift(); - /* 80CE4290 */ void init_modeWait(); - /* 80CE429C */ void modeWait(); - /* 80CE42A0 */ void init_modeUpMove(); - /* 80CE42C4 */ void modeUpMove(); - /* 80CE468C */ void init_modeDownMove(); - /* 80CE4698 */ void modeDownMove(); - /* 80CE4790 */ void init_modeMoveEnd(); - /* 80CE4A9C */ void modeMoveEnd(); - /* 80CE4AA0 */ void Draw(); - /* 80CE4B44 */ void Delete(); -}; - -struct daSpinLift_HIO_c { - /* 80CE3DAC */ daSpinLift_HIO_c(); - /* 80CE4C10 */ ~daSpinLift_HIO_c(); -}; - -struct cXyz {}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -178,17 +70,11 @@ extern "C" void cLib_chaseF__FPfff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -302,25 +188,30 @@ SECTION_DATA static u8 mode_proc[48] = { #pragma pop /* 80CE4E2C-80CE4E4C -00001 0020+00 1/0 0/0 0/0 .data l_daSpinLift_Method */ -SECTION_DATA static void* l_daSpinLift_Method[8] = { - (void*)daSpinLift_Create__FP10fopAc_ac_c, - (void*)daSpinLift_Delete__FP12daSpinLift_c, - (void*)daSpinLift_Execute__FP12daSpinLift_c, - (void*)NULL, - (void*)daSpinLift_Draw__FP12daSpinLift_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daSpinLift_Method = { + (process_method_func)daSpinLift_Create__FP10fopAc_ac_c, + (process_method_func)daSpinLift_Delete__FP12daSpinLift_c, + (process_method_func)daSpinLift_Execute__FP12daSpinLift_c, + 0, + (process_method_func)daSpinLift_Draw__FP12daSpinLift_c, }; /* 80CE4E4C-80CE4E7C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_SpinLift */ -SECTION_DATA extern void* g_profile_Obj_SpinLift[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00410000, (void*)&g_fpcLf_Method, - (void*)0x000005C0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02000000, (void*)&l_daSpinLift_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_SpinLift = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_SpinLift, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daSpinLift_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 512, // mPriority + &l_daSpinLift_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CE4E7C-80CE4EA4 0000F4 0028+00 1/1 0/0 0/0 .data __vt__12daSpinLift_c */ @@ -365,7 +256,8 @@ asm daSpinLift_HIO_c::daSpinLift_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_spinLift/d_a_obj_spinLift/__dt__14mDoHIO_entry_cFv.s" } diff --git a/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink.cpp b/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink.cpp index e8a933847db..0e29c1ec34e 100644 --- a/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink.cpp +++ b/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink.cpp @@ -1,237 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_ss_drink -// +/** + * @file d_a_obj_ss_drink.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTexPattern {}; - -struct mDoExt_btpAnm { - /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); - /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c {}; - -struct daPy_py_c { - /* 80CE673C */ void getLeftHandPos() const; -}; - -struct daObj_SSDrink_c { - /* 80CE4F78 */ ~daObj_SSDrink_c(); - /* 80CE51C8 */ void create(); - /* 80CE53EC */ void CreateHeap(); - /* 80CE55F0 */ void Delete(); - /* 80CE5624 */ void Execute(); - /* 80CE5858 */ void Draw(); - /* 80CE59DC */ void createHeapCallBack(fopAc_ac_c*); - /* 80CE59FC */ void setSoldOut(); - /* 80CE5A50 */ void getResName(); - /* 80CE5A60 */ void getTypeFromParam(); - /* 80CE5B0C */ void getSwitchFromParam(); - /* 80CE5B18 */ void getCapacityFromParam(); - /* 80CE5B3C */ void getFlowNodeNum(); - /* 80CE5B74 */ void getValue(); - /* 80CE5B80 */ void restart(); - /* 80CE5BF0 */ void initialize(); - /* 80CE5DB0 */ void checkProcess(int (daObj_SSDrink_c::*)(void*)); - /* 80CE5DDC */ void setProcess(int (daObj_SSDrink_c::*)(void*)); - /* 80CE5EC8 */ void setParam(); - /* 80CE5FE4 */ void setEnvTevColor(); - /* 80CE6040 */ void setRoomNo(); - /* 80CE6084 */ void setMtx(); - /* 80CE60E8 */ void setAttnPos(); - /* 80CE6170 */ void animeEntry(); - /* 80CE61E4 */ void animePlay(); - /* 80CE622C */ void chkEvent(); - /* 80CE63AC */ void orderEvent(); - /* 80CE644C */ bool wait(void*); - /* 80CE6454 */ void talk(void*); - /* 80CE6514 */ void drink(void*); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; -}; - -struct daObj_SSBase_c { - /* 8015E3F8 */ daObj_SSBase_c(); - /* 8015E450 */ ~daObj_SSBase_c(); - /* 8015E4B0 */ void getProcessID(); -}; - -struct daMyna_c { - /* 809487EC */ void soldoutItem(unsigned int); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 800352B0 */ void offSwitch(int, int); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); -}; - -struct dMsgFlow_c { - /* 80249F00 */ dMsgFlow_c(); - /* 80249F48 */ ~dMsgFlow_c(); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dEvent_manager_c { - /* 800487F0 */ void ChkPresentEnd(); -}; - -struct _GXTexObj {}; - -struct dDlst_shadowControl_c { - /* 80055F84 */ void setSimple(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*); - - static u8 mSimpleTexObj[32]; -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); - /* 80CE6858 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80CE68B4 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F40 */ void SetWallR(f32); - /* 80075F58 */ void SetWall(f32, f32); - /* 80CE67E8 */ ~dBgS_AcchCir(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct dBgS { - /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGPla { - /* 80CE5994 */ ~cM3dGPla(); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80CE6758 */ ~cM3dGCyl(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 80CE67A0 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80CE66AC */ ~cCcD_GStts(); -}; - -struct cBgS_GndChk { - /* 80267C1C */ cBgS_GndChk(); - /* 80267C94 */ ~cBgS_GndChk(); -}; - -struct cBgS { - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80CE55A8 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -349,8 +123,6 @@ extern "C" void SetR__8cM3dGCylFf(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_test(); extern "C" void __ptmf_cmpr(); extern "C" void __ptmf_scall(); @@ -362,8 +134,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -372,7 +142,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" void soldoutItem__8daMyna_cFUi(); // @@ -500,25 +269,30 @@ SECTION_DATA static void* lit_4432[3] = { }; /* 80CE6AA8-80CE6AC8 -00001 0020+00 1/0 0/0 0/0 .data daObj_SSDrink_MethodTable */ -SECTION_DATA static void* daObj_SSDrink_MethodTable[8] = { - (void*)daObj_SSDrink_Create__FPv, - (void*)daObj_SSDrink_Delete__FPv, - (void*)daObj_SSDrink_Execute__FPv, - (void*)daObj_SSDrink_IsDelete__FPv, - (void*)daObj_SSDrink_Draw__FPv, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObj_SSDrink_MethodTable = { + (process_method_func)daObj_SSDrink_Create__FPv, + (process_method_func)daObj_SSDrink_Delete__FPv, + (process_method_func)daObj_SSDrink_Execute__FPv, + (process_method_func)daObj_SSDrink_IsDelete__FPv, + (process_method_func)daObj_SSDrink_Draw__FPv, }; /* 80CE6AC8-80CE6AF8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_SSDRINK */ -SECTION_DATA extern void* g_profile_OBJ_SSDRINK[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01200000, (void*)&g_fpcLf_Method, - (void*)0x00000B10, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00440000, (void*)&daObj_SSDrink_MethodTable, - (void*)0x00064100, (void*)0x050E0000, +extern actor_process_profile_definition g_profile_OBJ_SSDRINK = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_SSDRINK, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObj_SSDrink_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 68, // mPriority + &daObj_SSDrink_MethodTable, // sub_method + 0x00064100, // mStatus + fopAc_UNK_GROUP_5_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CE6AF8-80CE6B04 000134 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGPla */ @@ -646,7 +420,8 @@ asm void daObj_SSDrink_c::CreateHeap() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink/__dt__12J3DFrameCtrlFv.s" } @@ -708,7 +483,8 @@ asm void daObj_SSDrink_c::Draw() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGPla::~cM3dGPla() { +// asm cM3dGPla::~cM3dGPla() { +extern "C" asm void __dt__8cM3dGPlaFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink/__dt__8cM3dGPlaFv.s" } @@ -1054,7 +830,8 @@ static bool daObj_SSDrink_IsDelete(void* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink/__dt__10cCcD_GSttsFv.s" } @@ -1099,7 +876,8 @@ static asm void func_80CE6734() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::getLeftHandPos() const { +// asm void daPy_py_c::getLeftHandPos() const { +extern "C" asm void getLeftHandPos__9daPy_py_cCFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink/getLeftHandPos__9daPy_py_cCFv.s" } @@ -1109,7 +887,8 @@ asm void daPy_py_c::getLeftHandPos() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink/__dt__8cM3dGCylFv.s" } @@ -1119,7 +898,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink/__dt__8cM3dGAabFv.s" } @@ -1129,7 +909,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink/__dt__12dBgS_AcchCirFv.s" } @@ -1139,7 +920,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink/__dt__10dCcD_GSttsFv.s" } @@ -1149,7 +931,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock.cpp b/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock.cpp index eb24a28ef92..e3a06fdb072 100644 --- a/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock.cpp +++ b/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock.cpp @@ -1,133 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_stairBlock -// +/** + * @file d_a_obj_stairBlock.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80CE81AC */ ~mDoHIO_entry_c(); -}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); - /* 80CE8790 */ ~mDoExt_bckAnm(); - /* 80CE87E4 */ mDoExt_bckAnm(); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daStairBlock_c { - /* 80CE81F4 */ void setBaseMtx(); - /* 80CE82A0 */ void CreateHeap(); - /* 80CE83F0 */ void create(); - /* 80CE8874 */ void createHeapCallBack(fopAc_ac_c*); - /* 80CE88A0 */ void Execute(); - /* 80CE8B24 */ void Draw(); - /* 80CE8C08 */ void Delete(); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDSph[64]; -}; - -struct daStairBlock_HIO_c { - /* 80CE816C */ daStairBlock_HIO_c(); - /* 80CE8CDC */ ~daStairBlock_HIO_c(); -}; - -struct dKy_tevstr_c {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcSph {}; - -struct dCcD_Sph { - /* 80084A34 */ void Set(dCcD_SrcSph const&); - /* 80CE85B0 */ ~dCcD_Sph(); - /* 80CE867C */ dCcD_Sph(); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 80084658 */ void ChkCoHit(); -}; - -struct cM3dGSph { - /* 8026F648 */ void SetC(cXyz const&); - /* 8026F708 */ void SetR(f32); - /* 80CE8700 */ ~cM3dGSph(); -}; - -struct cM3dGAab { - /* 80CE8748 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80CE882C */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -191,8 +70,6 @@ extern "C" void SetR__8cM3dGSphFf(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __construct_array(); extern "C" void _savegpr_18(); extern "C" void _savegpr_20(); @@ -204,8 +81,6 @@ extern "C" void _restgpr_20(); extern "C" void _restgpr_24(); extern "C" void _restgpr_25(); extern "C" void _restgpr_27(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; @@ -213,8 +88,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -241,25 +114,30 @@ SECTION_DATA u8 daStairBlock_c::mCcDSph[64] = { }; /* 80CE8F18-80CE8F38 -00001 0020+00 1/0 0/0 0/0 .data l_daStairBlock_Method */ -SECTION_DATA static void* l_daStairBlock_Method[8] = { - (void*)daStairBlock_Create__FP10fopAc_ac_c, - (void*)daStairBlock_Delete__FP14daStairBlock_c, - (void*)daStairBlock_Execute__FP14daStairBlock_c, - (void*)NULL, - (void*)daStairBlock_Draw__FP14daStairBlock_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daStairBlock_Method = { + (process_method_func)daStairBlock_Create__FP10fopAc_ac_c, + (process_method_func)daStairBlock_Delete__FP14daStairBlock_c, + (process_method_func)daStairBlock_Execute__FP14daStairBlock_c, + 0, + (process_method_func)daStairBlock_Draw__FP14daStairBlock_c, }; /* 80CE8F38-80CE8F68 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_StairBlock */ -SECTION_DATA extern void* g_profile_Obj_StairBlock[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01660000, (void*)&g_fpcLf_Method, - (void*)0x0000132C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01F40000, (void*)&l_daStairBlock_Method, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_StairBlock = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_StairBlock, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daStairBlock_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 500, // mPriority + &l_daStairBlock_Method, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CE8F68-80CE8F74 000090 000C+00 3/3 0/0 0/0 .data __vt__12J3DFrameCtrl */ @@ -321,7 +199,8 @@ asm daStairBlock_HIO_c::daStairBlock_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock/__dt__14mDoHIO_entry_cFv.s" } @@ -430,7 +309,8 @@ asm void daStairBlock_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Sph::~dCcD_Sph() { +// asm dCcD_Sph::~dCcD_Sph() { +extern "C" asm void __dt__8dCcD_SphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock/__dt__8dCcD_SphFv.s" } @@ -440,7 +320,8 @@ asm dCcD_Sph::~dCcD_Sph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Sph::dCcD_Sph() { +// asm dCcD_Sph::dCcD_Sph() { +extern "C" asm void __ct__8dCcD_SphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock/__ct__8dCcD_SphFv.s" } @@ -450,7 +331,8 @@ asm dCcD_Sph::dCcD_Sph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { +// asm cM3dGSph::~cM3dGSph() { +extern "C" asm void __dt__8cM3dGSphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock/__dt__8cM3dGSphFv.s" } @@ -460,7 +342,8 @@ asm cM3dGSph::~cM3dGSph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock/__dt__8cM3dGAabFv.s" } @@ -470,7 +353,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoExt_bckAnm::~mDoExt_bckAnm() { +// asm mDoExt_bckAnm::~mDoExt_bckAnm() { +extern "C" asm void __dt__13mDoExt_bckAnmFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock/__dt__13mDoExt_bckAnmFv.s" } @@ -480,7 +364,8 @@ asm mDoExt_bckAnm::~mDoExt_bckAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoExt_bckAnm::mDoExt_bckAnm() { +// asm mDoExt_bckAnm::mDoExt_bckAnm() { +extern "C" asm void __ct__13mDoExt_bckAnmFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock/__ct__13mDoExt_bckAnmFv.s" } @@ -490,7 +375,8 @@ asm mDoExt_bckAnm::mDoExt_bckAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_stick/d_a_obj_stick.cpp b/rel/d/a/obj/d_a_obj_stick/d_a_obj_stick.cpp index af501e93a6a..d9679fa506f 100644 --- a/rel/d/a/obj/d_a_obj_stick/d_a_obj_stick.cpp +++ b/rel/d/a/obj/d_a_obj_stick/d_a_obj_stick.cpp @@ -1,152 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_stick -// +/** + * @file d_a_obj_stick.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_stick/d_a_obj_stick.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObj_Stick_c { - /* 8059922C */ ~daObj_Stick_c(); - /* 805993E8 */ void create(); - /* 80599888 */ void CreateHeap(); - /* 80599900 */ void Delete(); - /* 80599934 */ void Execute(); - /* 80599A78 */ void Draw(); - /* 80599B3C */ void createHeapCallBack(fopAc_ac_c*); - /* 80599B5C */ void getResName(); - /* 80599B6C */ void isDelete(); - /* 80599B8C */ void setEnvTevColor(); - /* 80599BE8 */ void setRoomNo(); - /* 80599C28 */ void setMtx(); - - static u8 mCcDSph[64]; -}; - -struct daObj_Stick_Param_c { - /* 80599DD0 */ ~daObj_Stick_Param_c(); - - static u8 const m[16]; -}; - -struct daNpcT_c { - static u8 const mCcDObjData[48]; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcSph {}; - -struct dCcD_Sph { - /* 80084A34 */ void Set(dCcD_SrcSph const&); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 805997BC */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80599818 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 8059974C */ ~dBgS_AcchCir(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct dBgS { - /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGSph { - /* 805996BC */ ~cM3dGSph(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 80599704 */ ~cM3dGAab(); -}; - -struct cCcD_GStts { - /* 80599D14 */ ~cCcD_GStts(); -}; - -struct cBgS_GndChk { - /* 80267C1C */ cBgS_GndChk(); - /* 80267C94 */ ~cBgS_GndChk(); -}; - -struct _GXTexObj {}; - -struct J3DModel {}; // // Forward References: @@ -220,13 +80,9 @@ extern "C" void __dt__11cBgS_GndChkFv(); extern "C" void __dt__13cBgS_PolyInfoFv(); extern "C" void __dt__8cM3dGCirFv(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void _savegpr_28(); extern "C" void _restgpr_28(); extern "C" u8 const mCcDObjData__8daNpcT_c[48]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; @@ -235,7 +91,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" void __register_global_object(); // @@ -261,25 +116,30 @@ SECTION_DATA u8 daObj_Stick_c::mCcDSph[64] = { SECTION_DATA static void* l_resName = (void*)&d_a_obj_stick__stringBase0; /* 80599EB4-80599ED4 -00001 0020+00 1/0 0/0 0/0 .data daObj_Stick_MethodTable */ -SECTION_DATA static void* daObj_Stick_MethodTable[8] = { - (void*)daObj_Stick_Create__FPv, - (void*)daObj_Stick_Delete__FPv, - (void*)daObj_Stick_Execute__FPv, - (void*)daObj_Stick_IsDelete__FPv, - (void*)daObj_Stick_Draw__FPv, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObj_Stick_MethodTable = { + (process_method_func)daObj_Stick_Create__FPv, + (process_method_func)daObj_Stick_Delete__FPv, + (process_method_func)daObj_Stick_Execute__FPv, + (process_method_func)daObj_Stick_IsDelete__FPv, + (process_method_func)daObj_Stick_Draw__FPv, }; /* 80599ED4-80599F04 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_STICK */ -SECTION_DATA extern void* g_profile_OBJ_STICK[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01300000, (void*)&g_fpcLf_Method, - (void*)0x00000950, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00550000, (void*)&daObj_Stick_MethodTable, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_STICK = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_STICK, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObj_Stick_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 85, // mPriority + &daObj_Stick_MethodTable, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80599F04-80599F28 000094 0024+00 3/3 0/0 0/0 .data __vt__12dBgS_ObjAcch */ @@ -400,7 +260,8 @@ asm void daObj_Stick_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { +// asm cM3dGSph::~cM3dGSph() { +extern "C" asm void __dt__8cM3dGSphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_stick/d_a_obj_stick/__dt__8cM3dGSphFv.s" } @@ -410,7 +271,8 @@ asm cM3dGSph::~cM3dGSph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_stick/d_a_obj_stick/__dt__8cM3dGAabFv.s" } @@ -420,7 +282,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_stick/d_a_obj_stick/__dt__12dBgS_AcchCirFv.s" } @@ -430,7 +293,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_stick/d_a_obj_stick/__dt__10dCcD_GSttsFv.s" } @@ -440,7 +304,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_stick/d_a_obj_stick/__dt__12dBgS_ObjAcchFv.s" } @@ -612,7 +477,8 @@ static bool daObj_Stick_IsDelete(void* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_stick/d_a_obj_stick/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.cpp b/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.cpp index ab3eea29f6c..a9c2c8e3e40 100644 --- a/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.cpp +++ b/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.cpp @@ -1,126 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_stopper -// +/** + * @file d_a_obj_stopper.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.h" #include "dol2asm.h" -// -// Types: -// - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); - /* 8006FB10 */ void StartQuake(int, int, cXyz); - /* 8006FD94 */ void StopQuake(int); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dPa_levelEcallBack { - /* 80CED4C4 */ void cleanup(); - /* 80CEEEC4 */ ~dPa_levelEcallBack(); -}; - -struct dPa_followEcallBack { - /* 80049580 */ dPa_followEcallBack(u8, u8); - /* 80CED440 */ ~dPa_followEcallBack(); - /* 80CED4C8 */ void __defctor(); -}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dEvent_manager_c { - /* 80047698 */ void getEventIdx(fopAc_ac_c*, u8); - /* 80047A78 */ void endCheck(s16); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80CED580 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); -}; - -struct dBgW {}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80CED64C */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80CED5DC */ ~dBgS_AcchCir(); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); -}; - -struct cM3dGCyl { - /* 80CED4F0 */ ~cM3dGCyl(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 80CED538 */ ~cM3dGAab(); -}; - -struct cCcD_GStts { - /* 80CEEE7C */ ~cCcD_GStts(); -}; - -struct JPABaseEmitter {}; - -struct JPAEmitterCallBack { - /* 8027E6A4 */ ~JPAEmitterCallBack(); - /* 80CEEF38 */ void execute(JPABaseEmitter*); - /* 80CEEF3C */ void executeAfter(JPABaseEmitter*); - /* 80CEEF40 */ void draw(JPABaseEmitter*); - /* 80CEEF44 */ void drawAfter(JPABaseEmitter*); -}; - // // Forward References: // @@ -561,25 +446,30 @@ SECTION_DATA static u8 l_func[96] = { #pragma pop /* 80CEF0E0-80CEF100 -00001 0020+00 1/0 0/0 0/0 .data l_daObjStopper_Method */ -SECTION_DATA static void* l_daObjStopper_Method[8] = { - (void*)daObjStopper_Create__FP10fopAc_ac_c, - (void*)daObjStopper_Delete__FP14daObjStopper_c, - (void*)daObjStopper_Execute__FP14daObjStopper_c, - (void*)NULL, - (void*)daObjStopper_Draw__FP14daObjStopper_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjStopper_Method = { + (process_method_func)daObjStopper_Create__FP10fopAc_ac_c, + (process_method_func)daObjStopper_Delete__FP14daObjStopper_c, + (process_method_func)daObjStopper_Execute__FP14daObjStopper_c, + 0, + (process_method_func)daObjStopper_Draw__FP14daObjStopper_c, }; /* 80CEF100-80CEF130 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Stopper */ -SECTION_DATA extern void* g_profile_Obj_Stopper[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01600000, (void*)&g_fpcLf_Method, - (void*)0x00000A00, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01C60000, (void*)&l_daObjStopper_Method, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Stopper = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Stopper, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjStopper_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 454, // mPriority + &l_daObjStopper_Method, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CEF130-80CEF13C 000130 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ @@ -671,14 +561,16 @@ asm void daObjStopper_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dPa_followEcallBack::~dPa_followEcallBack() { +// asm dPa_followEcallBack::~dPa_followEcallBack() { +extern "C" asm void __dt__19dPa_followEcallBackFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper/__dt__19dPa_followEcallBackFv.s" } #pragma pop /* 80CED4C4-80CED4C8 0006A4 0004+00 1/0 0/0 0/0 .text cleanup__18dPa_levelEcallBackFv */ -void dPa_levelEcallBack::cleanup() { +// void dPa_levelEcallBack::cleanup() { +extern "C" asm void cleanup__18dPa_levelEcallBackFv() { /* empty function */ } @@ -687,7 +579,8 @@ void dPa_levelEcallBack::cleanup() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dPa_followEcallBack::__defctor() { +// asm void dPa_followEcallBack::__defctor() { +extern "C" asm void __defctor__19dPa_followEcallBackFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper/__defctor__19dPa_followEcallBackFv.s" } @@ -697,7 +590,8 @@ asm void dPa_followEcallBack::__defctor() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper/__dt__8cM3dGCylFv.s" } @@ -707,7 +601,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper/__dt__8cM3dGAabFv.s" } @@ -717,7 +612,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper/__dt__10dCcD_GSttsFv.s" } @@ -727,7 +623,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper/__dt__12dBgS_AcchCirFv.s" } @@ -737,7 +634,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper/__dt__12dBgS_ObjAcchFv.s" } @@ -1036,7 +934,8 @@ static asm void daObjStopper_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper/__dt__10cCcD_GSttsFv.s" } @@ -1046,7 +945,8 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dPa_levelEcallBack::~dPa_levelEcallBack() { +// asm dPa_levelEcallBack::~dPa_levelEcallBack() { +extern "C" asm void __dt__18dPa_levelEcallBackFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper/__dt__18dPa_levelEcallBackFv.s" } @@ -1054,25 +954,29 @@ asm dPa_levelEcallBack::~dPa_levelEcallBack() { /* 80CEEF38-80CEEF3C 002118 0004+00 1/0 0/0 0/0 .text * execute__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::execute(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::execute(JPABaseEmitter* param_0) { +extern "C" asm void execute__18JPAEmitterCallBackFP14JPABaseEmitter() { /* empty function */ } /* 80CEEF3C-80CEEF40 00211C 0004+00 1/0 0/0 0/0 .text * executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::executeAfter(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::executeAfter(JPABaseEmitter* param_0) { +extern "C" asm void executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter() { /* empty function */ } /* 80CEEF40-80CEEF44 002120 0004+00 1/0 0/0 0/0 .text draw__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::draw(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::draw(JPABaseEmitter* param_0) { +extern "C" asm void draw__18JPAEmitterCallBackFP14JPABaseEmitter() { /* empty function */ } /* 80CEEF44-80CEEF48 002124 0004+00 1/0 0/0 0/0 .text * drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::drawAfter(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::drawAfter(JPABaseEmitter* param_0) { +extern "C" asm void drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter() { /* empty function */ } diff --git a/rel/d/a/obj/d_a_obj_stopper2/d_a_obj_stopper2.cpp b/rel/d/a/obj/d_a_obj_stopper2/d_a_obj_stopper2.cpp index dc1be581509..7302ea296b6 100644 --- a/rel/d/a/obj/d_a_obj_stopper2/d_a_obj_stopper2.cpp +++ b/rel/d/a/obj/d_a_obj_stopper2/d_a_obj_stopper2.cpp @@ -6,39 +6,6 @@ #include "rel/d/a/obj/d_a_obj_stopper2/d_a_obj_stopper2.h" #include "dol2asm.h" -class daObjStopper2_c : public fopAc_ac_c { - /* 80CEF368 */ J3DModelData* getStopModelData(); - /* 80CEF38C */ void initBaseMtx(); - /* 80CEF3C8 */ void setBaseMtx(); - /* 80CEF434 */ float getMaxOffsetY(); - /* 80CEF44C */ int Create(); - /* 80CEF57C */ int CreateHeap(); - /* 80CEF5C8 */ int create(); - /* 80CEF66C */ int execute(); - /* 80CEF6A4 */ void event_proc_call(); - /* 80CEF760 */ void actionWait(); - /* 80CEF98C */ void actionOrderEvent(); - /* 80CEFA60 */ void actionEvent(); - /* 80CEFAD4 */ void actionDead(); - /* 80CEFAD8 */ void demoProc(); - /* 80CEFD40 */ int draw(); - /* 80CEFDB8 */ int _delete(); - - u32 getEvId() { return fopAcM_GetParamBit(this, 8, 8); } - u32 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); } - void setAction(u8 i_action) { mAction = i_action; } - - /* 0x568 */ request_of_phase_process_class mPhaseReq; - /* 0x570 */ J3DModel* mpModel; - /* 0x574 */ f32 field_0x574; - /* 0x578 */ s32 field_0x578; - /* 0x57C */ u16 field_0x57c[4]; - /* 0x584 */ u8 field_0x584; - /* 0x585 */ u8 field_0x585; - /* 0x586 */ u8 mAction; - /* 0x587 */ u8 field_0x587; - /* 0x588 */ u8 field_0x588; -}; // Size: 0x58C // // Forward References: @@ -68,7 +35,6 @@ extern "C" static void daObjStopper2_Delete__FP15daObjStopper2_c(); extern "C" static void daObjStopper2_Create__FP15daObjStopper2_c(); extern "C" void func_80CEFE6C(void* _this, u8*); extern "C" extern char const* const d_a_obj_stopper2__stringBase0; -extern "C" extern void* g_profile_Obj_Stopper2[12]; // // External References: @@ -510,23 +476,28 @@ extern "C" asm void func_80CEFE6C(void* _this, u8* param_0) { /* ############################################################################################## */ /* 80CEFFA8-80CEFFC8 -00001 0020+00 1/0 0/0 0/0 .data l_daObjStopper2_Method */ -SECTION_DATA static void* l_daObjStopper2_Method[8] = { - (void*)daObjStopper2_Create__FP15daObjStopper2_c, - (void*)daObjStopper2_Delete__FP15daObjStopper2_c, - (void*)daObjStopper2_Execute__FP15daObjStopper2_c, - (void*)NULL, - (void*)daObjStopper2_Draw__FP15daObjStopper2_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjStopper2_Method = { + (process_method_func)daObjStopper2_Create__FP15daObjStopper2_c, + (process_method_func)daObjStopper2_Delete__FP15daObjStopper2_c, + (process_method_func)daObjStopper2_Execute__FP15daObjStopper2_c, + 0, + (process_method_func)daObjStopper2_Draw__FP15daObjStopper2_c, }; /* 80CEFFC8-80CEFFF8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Stopper2 */ -SECTION_DATA extern void* g_profile_Obj_Stopper2[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00E70000, (void*)&g_fpcLf_Method, - (void*)0x0000058C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02340000, (void*)&l_daObjStopper2_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Stopper2 = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Stopper2, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjStopper2_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 564, // mPriority + &l_daObjStopper2_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.cpp b/rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.cpp index 247c3ae0a74..df4fb2c3c8d 100644 --- a/rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.cpp +++ b/rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.cpp @@ -1,79 +1,21 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_sw -// +/** + * @file d_a_obj_sw.cpp + * +*/ //#define VIRTUAL_3DLINEMAT #include "m_Do/m_Do_ext.h" +#include "d/d_camera.h" #include "rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_sw_class {}; - -struct obj_sc_s { - /* 80CF2F3C */ ~obj_sc_s(); - /* 80CF2FA8 */ obj_sc_s(); -}; - - - - -struct ResTIMG {}; - - -struct dKy_tevstr_c {}; -struct mDoCPd_c { - static u8 m_cpadInfo[256]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daPy_py_c { - /* 80CF2FDC */ void getLeftHandPos() const; -}; - - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; -struct dRes_info_c {}; -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dCamera_c { - /* 801614AC */ void Start(); - /* 801614D0 */ void Stop(); - /* 8016300C */ void SetTrimSize(s32); - /* 80180AE0 */ void Set(cXyz, cXyz, f32, s16); - /* 80180BA0 */ void Reset(cXyz, cXyz, f32, s16); -}; // // Forward References: @@ -173,15 +115,11 @@ extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__16Z2SoundObjSimple[8]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; // // Declarations: @@ -772,25 +710,30 @@ COMPILER_STRIP_GATE(0x80CF30E8, &lit_4865); #pragma pop /* 80CF3210-80CF3230 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Sw_Method */ -SECTION_DATA static void* l_daObj_Sw_Method[8] = { - (void*)daObj_Sw_Create__FP10fopAc_ac_c, - (void*)daObj_Sw_Delete__FP12obj_sw_class, - (void*)daObj_Sw_Execute__FP12obj_sw_class, - (void*)daObj_Sw_IsDelete__FP12obj_sw_class, - (void*)daObj_Sw_Draw__FP12obj_sw_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObj_Sw_Method = { + (process_method_func)daObj_Sw_Create__FP10fopAc_ac_c, + (process_method_func)daObj_Sw_Delete__FP12obj_sw_class, + (process_method_func)daObj_Sw_Execute__FP12obj_sw_class, + (process_method_func)daObj_Sw_IsDelete__FP12obj_sw_class, + (process_method_func)daObj_Sw_Draw__FP12obj_sw_class, }; /* 80CF3230-80CF3260 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_SW */ -SECTION_DATA extern void* g_profile_OBJ_SW[12] = { - (void*)0xFFFFFFFD, (void*)0x0004FFFD, - (void*)0x00F10000, (void*)&g_fpcLf_Method, - (void*)0x00000D90, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x003C0000, (void*)&l_daObj_Sw_Method, - (void*)0x00044000, (void*)NULL, +extern actor_process_profile_definition g_profile_OBJ_SW = { + fpcLy_CURRENT_e, // mLayerID + 4, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_SW, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(obj_sw_class), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 60, // mPriority + &l_daObj_Sw_Method, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_0_e, // cullType }; /* 80CF3260-80CF3274 000164 0014+00 1/1 0/0 0/0 .data __vt__18mDoExt_3DlineMat_c */ @@ -838,7 +781,8 @@ asm obj_sc_s::obj_sc_s() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::getLeftHandPos() const { +// asm void daPy_py_c::getLeftHandPos() const { +extern "C" asm void getLeftHandPos__9daPy_py_cCFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_sw/d_a_obj_sw/getLeftHandPos__9daPy_py_cCFv.s" } diff --git a/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp b/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp index 58cda104194..9e7a7c4fdf9 100644 --- a/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp +++ b/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_swBallA -// +/** + * @file d_a_obj_swBallA.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.h" #include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h" @@ -350,25 +350,30 @@ SECTION_DATA static u8 l_func[24] = { #pragma pop /* 80CF446C-80CF448C -00001 0020+00 1/0 0/0 0/0 .data l_daObjSwBallA_Method */ -SECTION_DATA static void* l_daObjSwBallA_Method[8] = { - (void*)daObjSwBallA_Create__FP10fopAc_ac_c, - (void*)daObjSwBallA_Delete__FP14daObjSwBallA_c, - (void*)daObjSwBallA_Execute__FP14daObjSwBallA_c, - (void*)NULL, - (void*)daObjSwBallA_Draw__FP14daObjSwBallA_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjSwBallA_Method = { + (process_method_func)daObjSwBallA_Create__FP10fopAc_ac_c, + (process_method_func)daObjSwBallA_Delete__FP14daObjSwBallA_c, + (process_method_func)daObjSwBallA_Execute__FP14daObjSwBallA_c, + 0, + (process_method_func)daObjSwBallA_Draw__FP14daObjSwBallA_c, }; /* 80CF448C-80CF44BC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_SwBallA */ -SECTION_DATA extern void* g_profile_Obj_SwBallA[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01990000, (void*)&g_fpcLf_Method, - (void*)0x000005CC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x023B0000, (void*)&l_daObjSwBallA_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_SwBallA = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_SwBallA, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjSwBallA_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 571, // mPriority + &l_daObjSwBallA_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CF44BC-80CF44E0 0000A4 0024+00 2/2 0/0 0/0 .data __vt__14daObjSwBallA_c */ diff --git a/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp b/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp index 9307a8fa560..d83914c1ee2 100644 --- a/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp +++ b/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_swBallB -// +/** + * @file d_a_obj_swBallB.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.h" #include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h" @@ -78,10 +78,6 @@ extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -// extern "C" void PSMTXCopy(); -// extern "C" void PSMTXConcat(); -// extern "C" void PSMTXTrans(); -// extern "C" void C_MTXLightOrtho(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_22(); extern "C" void _savegpr_26(); @@ -91,11 +87,7 @@ extern "C" void _restgpr_22(); extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -// extern "C" extern void* g_fopAc_Method[8]; -// extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; -// extern "C" extern u8 g_env_light[4880]; -// extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // @@ -363,25 +355,30 @@ SECTION_DATA static u8 l_func[24] = { #pragma pop /* 80CF5A74-80CF5A94 -00001 0020+00 1/0 0/0 0/0 .data l_daObjSwBallB_Method */ -SECTION_DATA static void* l_daObjSwBallB_Method[8] = { - (void*)daObjSwBallB_Create__FP10fopAc_ac_c, - (void*)daObjSwBallB_Delete__FP14daObjSwBallB_c, - (void*)daObjSwBallB_Execute__FP14daObjSwBallB_c, - (void*)NULL, - (void*)daObjSwBallB_Draw__FP14daObjSwBallB_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjSwBallB_Method = { + (process_method_func)daObjSwBallB_Create__FP10fopAc_ac_c, + (process_method_func)daObjSwBallB_Delete__FP14daObjSwBallB_c, + (process_method_func)daObjSwBallB_Execute__FP14daObjSwBallB_c, + 0, + (process_method_func)daObjSwBallB_Draw__FP14daObjSwBallB_c, }; /* 80CF5A94-80CF5AC4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_SwBallB */ -SECTION_DATA extern void* g_profile_Obj_SwBallB[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x019A0000, (void*)&g_fpcLf_Method, - (void*)0x000005B0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x023C0000, (void*)&l_daObjSwBallB_Method, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_SwBallB = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_SwBallB, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjSwBallB_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 572, // mPriority + &l_daObjSwBallB_Method, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CF5AC4-80CF5AE8 0000A4 0024+00 2/2 0/0 0/0 .data __vt__14daObjSwBallB_c */ diff --git a/rel/d/a/obj/d_a_obj_swLight/d_a_obj_swLight.cpp b/rel/d/a/obj/d_a_obj_swLight/d_a_obj_swLight.cpp index b61ccc466c1..13c8b79f443 100644 --- a/rel/d/a/obj/d_a_obj_swLight/d_a_obj_swLight.cpp +++ b/rel/d/a/obj/d_a_obj_swLight/d_a_obj_swLight.cpp @@ -1,120 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_swLight -// +/** + * @file d_a_obj_swLight.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_swLight/d_a_obj_swLight.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjSwLight_c { - /* 80CF6F98 */ void initBaseMtx(); - /* 80CF6FD4 */ void setBaseMtx(); - /* 80CF7038 */ void Create(); - /* 80CF71F0 */ void CreateHeap(); - /* 80CF7260 */ void create1st(); - /* 80CF7320 */ void Execute(f32 (**)[3][4]); - /* 80CF73E0 */ void action(); - /* 80CF761C */ void init_modeSwOnWait(); - /* 80CF766C */ void modeSwOnWait(); - /* 80CF777C */ void init_modeOnLight(); - /* 80CF7788 */ void modeOnLight(); - /* 80CF77D8 */ void init_modeSwOffWait(); - /* 80CF7838 */ void modeSwOffWait(); - /* 80CF7974 */ void modeDead(); - /* 80CF7978 */ void checkHit(); - /* 80CF7A6C */ void setOnTimer(); - /* 80CF7A98 */ void Draw(); - /* 80CF7BA8 */ void Delete(); - /* 80CF8124 */ ~daObjSwLight_c(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 800352B0 */ void offSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dEvLib_callback_c { - /* 8004886C */ void eventUpdate(); - /* 80048940 */ void orderEvent(int, int, int); - /* 80CF80C4 */ ~dEvLib_callback_c(); - /* 80CF810C */ bool eventStart(); - /* 80CF8114 */ bool eventRun(); - /* 80CF811C */ bool eventEnd(); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDF48 */ ~Z2SoundObjBase(); - /* 802BDFF8 */ void deleteObject(); - /* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*); -}; - -struct JUTNameTab { - /* 802DEAF8 */ void getName(u16) const; -}; - -struct J3DModel {}; - -struct DALKMIST_INFLUENCE {}; // // Forward References: @@ -212,7 +105,6 @@ extern "C" void startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase(); extern "C" void __ct__16Z2SoundObjSimpleFv(); extern "C" void __dl__FPv(); extern "C" void getName__10JUTNameTabCFUs(); -extern "C" void PSMTXCopy(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void __ptmf_scall(); @@ -220,8 +112,6 @@ extern "C" void _savegpr_26(); extern "C" void _savegpr_29(); extern "C" void _restgpr_26(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__8dCcD_Cyl[36]; @@ -233,8 +123,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" extern void* __vt__16Z2SoundObjSimple[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_80CF8630[4]; @@ -632,25 +520,30 @@ asm void daObjSwLight_c::Delete() { /* ############################################################################################## */ /* 80CF8548-80CF8568 -00001 0020+00 1/0 0/0 0/0 .data daObjSwLight_METHODS */ -SECTION_DATA static void* daObjSwLight_METHODS[8] = { - (void*)daObjSwLight_create1st__FP14daObjSwLight_c, - (void*)daObjSwLight_MoveBGDelete__FP14daObjSwLight_c, - (void*)daObjSwLight_MoveBGExecute__FP14daObjSwLight_c, - (void*)NULL, - (void*)daObjSwLight_MoveBGDraw__FP14daObjSwLight_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjSwLight_METHODS = { + (process_method_func)daObjSwLight_create1st__FP14daObjSwLight_c, + (process_method_func)daObjSwLight_MoveBGDelete__FP14daObjSwLight_c, + (process_method_func)daObjSwLight_MoveBGExecute__FP14daObjSwLight_c, + 0, + (process_method_func)daObjSwLight_MoveBGDraw__FP14daObjSwLight_c, }; /* 80CF8568-80CF8598 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_SwLight */ -SECTION_DATA extern void* g_profile_Obj_SwLight[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00AC0000, (void*)&g_fpcLf_Method, - (void*)0x00000B28, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x022A0000, (void*)&daObjSwLight_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_SwLight = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_SwLight, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjSwLight_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 554, // mPriority + &daObjSwLight_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CF8598-80CF85A4 000130 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -844,7 +737,8 @@ extern "C" asm void __dt__10cCcD_GSttsFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dEvLib_callback_c::~dEvLib_callback_c() { +// asm dEvLib_callback_c::~dEvLib_callback_c() { +extern "C" asm void __dt__17dEvLib_callback_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swLight/d_a_obj_swLight/__dt__17dEvLib_callback_cFv.s" } @@ -852,17 +746,20 @@ asm dEvLib_callback_c::~dEvLib_callback_c() { /* 80CF810C-80CF8114 0011EC 0008+00 2/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventStart() { +// bool dEvLib_callback_c::eventStart() { +extern "C" bool eventStart__17dEvLib_callback_cFv() { return true; } /* 80CF8114-80CF811C 0011F4 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventRun() { +// bool dEvLib_callback_c::eventRun() { +extern "C" bool eventRun__17dEvLib_callback_cFv() { return true; } /* 80CF811C-80CF8124 0011FC 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventEnd() { +// bool dEvLib_callback_c::eventEnd() { +extern "C" bool eventEnd__17dEvLib_callback_cFv() { return true; } diff --git a/rel/d/a/obj/d_a_obj_swchain/d_a_obj_swchain.cpp b/rel/d/a/obj/d_a_obj_swchain/d_a_obj_swchain.cpp index 64717cce5b8..28a60580c32 100644 --- a/rel/d/a/obj/d_a_obj_swchain/d_a_obj_swchain.cpp +++ b/rel/d/a/obj/d_a_obj_swchain/d_a_obj_swchain.cpp @@ -1,138 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_swchain -// +/** + * @file d_a_obj_swchain.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_swchain/d_a_obj_swchain.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static u8 mGndCheck[84]; - static f32 mGroundY; -}; - -struct daPy_py_c { - /* 8015F478 */ void setFmChainPos(fopAc_ac_c*, cXyz*, int); - /* 8015F520 */ void setPlayerSe(u32); - /* 80CFB6C8 */ void getRightHandPos() const; -}; - -struct daObjSwChain_c { - struct chain_s { - /* 80CF8B00 */ ~chain_s(); - /* 80CF8B3C */ chain_s(); - }; - - /* 80CF8768 */ void Create(); - /* 80CF89C0 */ void CreateHeap(); - /* 80CF8B48 */ void create1st(); - /* 80CF8ED0 */ void execute(); - /* 80CF94E4 */ void getChainBasePos(cXyz*); - /* 80CF9500 */ void chain_control(); - /* 80CF99C0 */ void chain_control2(); - /* 80CFA05C */ void initChainMtx(); - /* 80CFA124 */ void setChainMtx(); - /* 80CFA4A8 */ void chain_count_control(); - /* 80CFAD50 */ void setTension(); - /* 80CFB450 */ void getTopChainNo(); - /* 80CFB464 */ void checkPlayerPull(); - /* 80CFB53C */ void draw(); - /* 80CFB5E8 */ void _delete(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 800352B0 */ void offSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dMdl_obj_c {}; - -struct dMdl_c { - /* 8009C650 */ void create(J3DModelData*, u16, dKy_tevstr_c*); - /* 8009C668 */ void entryObj(dMdl_obj_c*); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80CF8DD0 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); -}; - -struct csXyz {}; - -struct cBgS_PolyInfo {}; - -struct dBgS { - /* 80074B40 */ void ChkMoveBG_NoDABg(cBgS_PolyInfo const&); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS { - /* 80074618 */ void GetActorPointer(int) const; - /* 80074660 */ void ChkPolySafe(cBgS_PolyInfo const&); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -229,8 +103,6 @@ extern "C" void cLib_addCalcAngleS2__FPssss(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nwa__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void __construct_new_array(); extern "C" void _savegpr_24(); extern "C" void _savegpr_25(); @@ -242,8 +114,6 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__6dMdl_c[5 + 1 /* padding */]; @@ -254,7 +124,6 @@ extern "C" extern void* __vt__9J3DPacket[5]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" u8 mGndCheck__11fopAcM_gc_c[84]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -402,25 +271,30 @@ asm daObjSwChain_c::chain_s::chain_s() { /* ############################################################################################## */ /* 80CFB81C-80CFB83C -00001 0020+00 1/0 0/0 0/0 .data l_daObjSwChain_Method */ -SECTION_DATA static void* l_daObjSwChain_Method[8] = { - (void*)daObjSwChain_Create__FP10fopAc_ac_c, - (void*)daObjSwChain_Delete__FP14daObjSwChain_c, - (void*)daObjSwChain_Execute__FP14daObjSwChain_c, - (void*)NULL, - (void*)daObjSwChain_Draw__FP14daObjSwChain_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjSwChain_Method = { + (process_method_func)daObjSwChain_Create__FP10fopAc_ac_c, + (process_method_func)daObjSwChain_Delete__FP14daObjSwChain_c, + (process_method_func)daObjSwChain_Execute__FP14daObjSwChain_c, + 0, + (process_method_func)daObjSwChain_Draw__FP14daObjSwChain_c, }; /* 80CFB83C-80CFB86C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_SwChain */ -SECTION_DATA extern void* g_profile_Obj_SwChain[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x016F0000, (void*)&g_fpcLf_Method, - (void*)0x00000AA0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02670000, (void*)&l_daObjSwChain_Method, - (void*)0x000C0000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_SwChain = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_SwChain, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjSwChain_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 615, // mPriority + &l_daObjSwChain_Method, // sub_method + 0x000C0000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CFB86C-80CFB890 0000D4 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ @@ -464,7 +338,8 @@ asm void daObjSwChain_c::create1st() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swchain/d_a_obj_swchain/__dt__12dBgS_ObjAcchFv.s" } @@ -924,7 +799,8 @@ static asm void func_80CFB6C0() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::getRightHandPos() const { +// asm void daPy_py_c::getRightHandPos() const { +extern "C" asm void getRightHandPos__9daPy_py_cCFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swchain/d_a_obj_swchain/getRightHandPos__9daPy_py_cCFv.s" } diff --git a/rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.cpp b/rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.cpp index 72de0b9e936..0c3aee359e3 100644 --- a/rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.cpp +++ b/rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_swhang -// +/** + * @file d_a_obj_swhang.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.h" #include "d/com/d_com_inf_game.h" @@ -341,25 +341,30 @@ SECTION_DATA static u8 l_func[24] = { #pragma pop /* 80CFD3EC-80CFD40C -00001 0020+00 1/0 0/0 0/0 .data daObjSwHang_METHODS */ -SECTION_DATA static void* daObjSwHang_METHODS[8] = { - (void*)daObjSwHang_create1st__FP13daObjSwHang_c, - (void*)daObjSwHang_MoveBGDelete__FP13daObjSwHang_c, - (void*)daObjSwHang_MoveBGExecute__FP13daObjSwHang_c, - (void*)NULL, - (void*)daObjSwHang_MoveBGDraw__FP13daObjSwHang_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjSwHang_METHODS = { + (process_method_func)daObjSwHang_create1st__FP13daObjSwHang_c, + (process_method_func)daObjSwHang_MoveBGDelete__FP13daObjSwHang_c, + (process_method_func)daObjSwHang_MoveBGExecute__FP13daObjSwHang_c, + 0, + (process_method_func)daObjSwHang_MoveBGDraw__FP13daObjSwHang_c, }; /* 80CFD40C-80CFD43C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_SwHang */ -SECTION_DATA extern void* g_profile_Obj_SwHang[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00C40000, (void*)&g_fpcLf_Method, - (void*)0x00000790, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02040000, (void*)&daObjSwHang_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_SwHang = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_SwHang, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjSwHang_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 516, // mPriority + &daObjSwHang_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CFD43C-80CFD448 000184 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */ diff --git a/rel/d/a/obj/d_a_obj_sword/d_a_obj_sword.cpp b/rel/d/a/obj/d_a_obj_sword/d_a_obj_sword.cpp index 68edf2926cd..56826ca7325 100644 --- a/rel/d/a/obj/d_a_obj_sword/d_a_obj_sword.cpp +++ b/rel/d/a/obj/d_a_obj_sword/d_a_obj_sword.cpp @@ -1,129 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_sword -// +/** + * @file d_a_obj_sword.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_sword/d_a_obj_sword.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObjSword_c { - /* 80CFD558 */ void initBaseMtx(); - /* 80CFD594 */ void setBaseMtx(); - /* 80CFD600 */ void Create(); - /* 80CFD67C */ void create(); - /* 80CFDA14 */ void actionWait(); - /* 80CFDA8C */ void initActionOrderGetDemo(); - /* 80CFDB04 */ void actionOrderGetDemo(); - /* 80CFDB80 */ void actionGetDemo(); - /* 80CFDC1C */ void execute(); - /* 80CFDD18 */ void draw(); - /* 80CFDD6C */ void _delete(); -}; - -struct daItemBase_c { - /* 80037A64 */ void hide(); - /* 80037A74 */ void show(); - /* 80037ACC */ void chkDraw(); - /* 80144724 */ void DeleteBase(char const*); - /* 8014474C */ bool clothCreate(); - /* 80144754 */ bool __CreateHeap(); - /* 80144B94 */ void DrawBase(); - /* 80144C30 */ void RotateYBase(); - /* 80144C7C */ void setListStart(); - /* 80144CC4 */ void settingBeforeDraw(); - /* 80144D18 */ void setTevStr(); - /* 80144D70 */ void setShadow(); - /* 80144EDC */ void animEntry(); - /* 80145144 */ void chkFlag(int); - /* 80145164 */ void getTevFrm(); - /* 80145180 */ void getBtpFrm(); - /* 8014519C */ void getShadowSize(); - /* 801451B4 */ void getCollisionH(); - /* 801451D0 */ void getCollisionR(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 800354E0 */ void onItem(int, int); - /* 80035590 */ void isItem(int, int) const; -}; - -struct dItem_data { - static void* field_item_res[1020]; -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dEvent_manager_c { - /* 80047ADC */ void endCheckOld(char const*); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80CFD8D8 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80CFD9A4 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80CFD934 */ ~dBgS_AcchCir(); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); -}; - -struct csXyz {}; - -struct cXyz {}; - -struct cM3dGCyl { - /* 80CFD848 */ ~cM3dGCyl(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 80CFD890 */ ~cM3dGAab(); -}; - -struct cCcD_GStts { - /* 80CFDE24 */ ~cCcD_GStts(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; // // Forward References: @@ -202,13 +84,9 @@ extern "C" void getCollisionR__12daItemBase_cFv(); extern "C" void __dt__13cBgS_PolyInfoFv(); extern "C" void __dt__8cM3dGCirFv(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" void* field_item_res__10dItem_data[1020]; @@ -321,25 +199,30 @@ SECTION_DATA static u8 l_demoFunc[36] = { #pragma pop /* 80CFDF14-80CFDF34 -00001 0020+00 1/0 0/0 0/0 .data l_daObjSword_Method */ -SECTION_DATA static void* l_daObjSword_Method[8] = { - (void*)daObjSword_Create__FP12daObjSword_c, - (void*)daObjSword_Delete__FP12daObjSword_c, - (void*)daObjSword_Execute__FP12daObjSword_c, - (void*)NULL, - (void*)daObjSword_Draw__FP12daObjSword_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjSword_Method = { + (process_method_func)daObjSword_Create__FP12daObjSword_c, + (process_method_func)daObjSword_Delete__FP12daObjSword_c, + (process_method_func)daObjSword_Execute__FP12daObjSword_c, + 0, + (process_method_func)daObjSword_Draw__FP12daObjSword_c, }; /* 80CFDF34-80CFDF64 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Sword */ -SECTION_DATA extern void* g_profile_Obj_Sword[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01AC0000, (void*)&g_fpcLf_Method, - (void*)0x00000938, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x024A0000, (void*)&l_daObjSword_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Sword = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Sword, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjSword_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 586, // mPriority + &l_daObjSword_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CFDF64-80CFDF70 0000D0 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ @@ -425,7 +308,8 @@ asm void daObjSword_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_sword/d_a_obj_sword/__dt__8cM3dGCylFv.s" } @@ -435,7 +319,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_sword/d_a_obj_sword/__dt__8cM3dGAabFv.s" } @@ -445,7 +330,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_sword/d_a_obj_sword/__dt__10dCcD_GSttsFv.s" } @@ -455,7 +341,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_sword/d_a_obj_sword/__dt__12dBgS_AcchCirFv.s" } @@ -465,7 +352,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_sword/d_a_obj_sword/__dt__12dBgS_ObjAcchFv.s" } @@ -595,7 +483,8 @@ static asm void daObjSword_Create(daObjSword_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_sword/d_a_obj_sword/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.cpp b/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.cpp index dfc44fa49cf..cc6e03240a9 100644 --- a/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.cpp +++ b/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_swpropeller -// +/** + * @file d_a_obj_swpropeller.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.h" #include "d/com/d_com_inf_game.h" diff --git a/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.cpp b/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.cpp index 5c9a7e6a38e..7507e1e72d5 100644 --- a/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.cpp +++ b/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.cpp @@ -1,193 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_swpush -// +/** + * @file d_a_obj_swpush.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct cXyz { - /* 80483450 */ ~cXyz(); -}; - -struct mDoMtx_stack_c { - /* 8000CCC8 */ void push(); - /* 8000CD14 */ void pop(); - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CE38 */ void scaleM(f32, f32, f32); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct J3DJoint {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct daObjSwpush { - struct Act_c { - struct Prm_e {}; - - /* 80482D4C */ void prmZ_init(); - /* 80482D7C */ void is_switch2() const; - /* 80482DC4 */ void solidHeapCB(fopAc_ac_c*); - /* 80482DE8 */ void create_heap(); - /* 80482FE8 */ void create_res_load(); - /* 80483038 */ void Mthd_Create(); - /* 8048348C */ void Mthd_Delete(); - /* 804834E8 */ void set_mtx(); - /* 80483534 */ void init_mtx(); - /* 80483570 */ void set_btp_frame(); - /* 80483574 */ void rideCB(dBgW*, fopAc_ac_c*, fopAc_ac_c*); - /* 804839B4 */ void jnodeCB(J3DJoint*, int); - /* 80483A5C */ void calc_top_pos(); - /* 80483B70 */ void top_bg_aim_req(f32, s16); - /* 80483B7C */ void set_push_flag(); - /* 80483D0C */ void mode_upper_init(); - /* 80483D2C */ void mode_upper(); - /* 80483FA8 */ void mode_u_l_init(); - /* 80484008 */ void mode_u_l(); - /* 804841D4 */ void mode_lower_init(); - /* 804841F4 */ void mode_lower(); - /* 80484388 */ void mode_l_u_init(); - /* 804843C0 */ void mode_l_u(); - /* 80484570 */ void demo_non_init(); - /* 8048457C */ void demo_non(); - /* 80484580 */ void demo_reqPause_init(); - /* 804845D8 */ void demo_reqPause(); - /* 8048460C */ void demo_runPause_init(); - /* 8048464C */ void demo_runPause(); - /* 804846B4 */ void demo_stop_puase(); - /* 80484708 */ void demo_reqSw_init(); - /* 804847B4 */ void demo_reqSw(); - /* 80484828 */ void demo_runSw_init(); - /* 80484834 */ void demo_runSw(); - /* 80484890 */ void check_ride_couple(s16); - /* 804848D8 */ void nr_ride_people(char); - /* 80484908 */ void Mthd_Execute(); - /* 80484BB8 */ void Mthd_Draw(); - - static u8 const M_bmd[6 + 2 /* padding */]; - static u8 const M_dzb[6 + 2 /* padding */]; - static u8 const M_heap_size[12]; - static u8 const M_attr[220]; - static u32 const M_op_vtx; - static void* M_arcname[3]; - }; -}; - -struct daObj { - template - void PrmAbstract(/* ... */); - /* 80484CE4 */ /* daObj::PrmAbstract */ - void func_80484CE4(void* _this, fopAc_ac_c const*, daObjSwpush::Act_c::Prm_e, - daObjSwpush::Act_c::Prm_e); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 800352B0 */ void offSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; - /* 8003542C */ void revSwitch(int, int); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dEvent_manager_c { - /* 800474BC */ void getEventData(s16); - /* 80047698 */ void getEventIdx(fopAc_ac_c*, u8); - /* 80047A78 */ void endCheck(s16); -}; - -struct dBgW_Base {}; - -struct cBgD_t {}; - -struct dBgWSv { - /* 80082F98 */ void Set(cBgD_t*, u32); - /* 80083020 */ void CopyBackVtx(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct Vec {}; - -struct cM3dGTri { - /* 8026F7DC */ void setPos(Vec const*, Vec const*, Vec const*); - /* 80483910 */ ~cM3dGTri(); -}; - -struct cM3dGPla { - /* 8048396C */ ~cM3dGPla(); -}; - -struct cBgW { - /* 800793C4 */ void GlobalVtx(); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JUTNameTab { - /* 802DEAF8 */ void getName(u16) const; -}; - -struct J3DSys { - static u8 mCurrentMtx[48]; -}; - -struct J3DModel {}; // // Forward References: @@ -298,9 +116,6 @@ extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void getName__10JUTNameTabCFUs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_22(); extern "C" void _savegpr_24(); @@ -310,14 +125,9 @@ extern "C" void _restgpr_22(); extern "C" void _restgpr_24(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); -extern "C" void strcmp(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__6dBgWSv[65 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -562,7 +372,8 @@ asm void daObjSwpush::Act_c::Mthd_Create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush/__dt__4cXyzFv.s" } @@ -742,16 +553,30 @@ SECTION_DATA static u8 mode_proc[48] = { /* 80484F88-80484FA8 -00001 0020+00 1/0 0/0 0/0 .data * Mthd_Table__Q211daObjSwpush28@unnamed@d_a_obj_swpush_cpp@ */ -SECTION_DATA static void* data_80484F88[8] = { - (void*)func_80484C5C, (void*)func_80484C7C, (void*)func_80484C9C, (void*)func_80484CDC, - (void*)func_80484CBC, (void*)NULL, (void*)NULL, (void*)NULL, +static actor_method_class data_80484F88 = { + (process_method_func)func_80484C5C, + (process_method_func)func_80484C7C, + (process_method_func)func_80484C9C, + (process_method_func)func_80484CDC, + (process_method_func)func_80484CBC, }; /* 80484FA8-80484FD8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Swpush */ -SECTION_DATA extern void* g_profile_Obj_Swpush[12] = { - (void*)0xFFFFFFFD, (void*)0x0002FFFD, (void*)0x00160000, (void*)&g_fpcLf_Method, - (void*)0x00000604, (void*)NULL, (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x000B0000, (void*)&data_80484F88, (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Swpush = { + fpcLy_CURRENT_e, // mLayerID + 2, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Swpush, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjSwpush), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 11, // mPriority + &data_80484F88, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80484FD8-80484FE4 000154 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGTri */ @@ -906,7 +731,8 @@ asm void daObjSwpush::Act_c::rideCB(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGTri::~cM3dGTri() { +// asm cM3dGTri::~cM3dGTri() { +extern "C" asm void __dt__8cM3dGTriFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush/__dt__8cM3dGTriFv.s" } @@ -916,7 +742,8 @@ asm cM3dGTri::~cM3dGTri() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGPla::~cM3dGPla() { +// asm cM3dGPla::~cM3dGPla() { +extern "C" asm void __dt__8cM3dGPlaFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush/__dt__8cM3dGPlaFv.s" } diff --git a/rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2.cpp b/rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2.cpp index 22ff291fa90..2e1a5c48446 100644 --- a/rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2.cpp +++ b/rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2.cpp @@ -1,198 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_swpush2 -// +/** + * @file d_a_obj_swpush2.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct J3DAnmTextureSRTKey {}; - -struct J3DAnmTevRegKey {}; - -struct J3DAnmColor {}; - -struct J3DMaterialTable { - /* 8032F64C */ void removeMatColorAnimator(J3DAnmColor*); - /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); - /* 8032F880 */ void removeTevRegAnimator(J3DAnmTevRegKey*); -}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_bpkAnm { - /* 8000D47C */ void init(J3DMaterialTable*, J3DAnmColor*, int, int, f32, s16, s16); - /* 8000D518 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct dBgW { - /* 8007B9C0 */ void Move(); -}; - -struct daObjSwpush2 { - struct Act_c { - struct Prm_e {}; - - /* 80CFE098 */ void getArcName(); - /* 80CFE0A4 */ void getBmdName(); - /* 80CFE0B4 */ void getDzbName(); - /* 80CFE0C4 */ void getNmlBtkName(); - /* 80CFE0D4 */ void getNmlBrkName(); - /* 80CFE0E4 */ void getOnBtkName(); - /* 80CFE0F4 */ void getRunBpkName(); - /* 80CFE104 */ void getRunBrkName(); - /* 80CFE114 */ void getRunBtkName(); - /* 80CFE124 */ void prmZ_init(); - /* 80CFE154 */ void is_switch2() const; - /* 80CFE1AC */ void solidHeapCB(fopAc_ac_c*); - /* 80CFE1D0 */ void create_heap(); - /* 80CFE6D8 */ void create_init(); - /* 80CFE8CC */ void create_res_load(); - /* 80CFE928 */ void Mthd_Create(); - /* 80CFEA3C */ void Mthd_Delete(); - /* 80CFEAB4 */ void set_mtx(); - /* 80CFEB3C */ void init_mtx(); - /* 80CFEB78 */ void rideCB(dBgW*, fopAc_ac_c*, fopAc_ac_c*); - /* 80CFEBE4 */ void calc_top_pos(); - /* 80CFEC4C */ void set_push_flag(); - /* 80CFEDDC */ void mode_upper_init(); - /* 80CFEDFC */ void mode_upper(); - /* 80CFEF84 */ void mode_u_l_init(); - /* 80CFEF98 */ void mode_u_l(); - /* 80CFF168 */ void mode_lower_init(); - /* 80CFF188 */ void mode_lower(); - /* 80CFF18C */ void mode_l_u(); - /* 80CFF24C */ void demo_non_init(); - /* 80CFF258 */ void demo_non(); - /* 80CFF25C */ void demo_reqPause_init(); - /* 80CFF2B4 */ void demo_reqPause(); - /* 80CFF2EC */ void demo_runPause_init(int); - /* 80CFF31C */ void demo_runPause(); - /* 80CFF374 */ void demo_stop_puase(); - /* 80CFF3C8 */ void demo_reqSw_init(); - /* 80CFF48C */ void demo_reqSw(); - /* 80CFF500 */ void demo_runSw_init(); - /* 80CFF50C */ void demo_runSw(); - /* 80CFF568 */ void Mthd_Execute(); - /* 80CFF8FC */ void Mthd_Draw(); - - static u8 const M_arcname[9 + 3 /* padding */]; - static void* const M_attr[56]; - }; -}; - -struct daObj { - template - void PrmAbstract(/* ... */); - /* 80CFFBD0 */ /* daObj::PrmAbstract */ - void func_80CFFBD0(void* _this, fopAc_ac_c const*, daObjSwpush2::Act_c::Prm_e, - daObjSwpush2::Act_c::Prm_e); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 800352B0 */ void offSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; - /* 8003542C */ void revSwitch(int, int); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dEvent_manager_c { - /* 800474BC */ void getEventData(s16); - /* 80047698 */ void getEventIdx(fopAc_ac_c*, u8); - /* 80047A78 */ void endCheck(s16); -}; - -struct dBgW_Base {}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct cBgD_t {}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80CFE690 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -300,9 +113,6 @@ extern "C" void init__12J3DFrameCtrlFs(); extern "C" void removeMatColorAnimator__16J3DMaterialTableFP11J3DAnmColor(); extern "C" void removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey(); extern "C" void removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSVECSquareDistance(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_25(); extern "C" void _savegpr_27(); @@ -312,13 +122,8 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 struct_80CFFEF8[4]; @@ -708,16 +513,30 @@ SECTION_DATA static u8 mode_proc[48] = { /* 80CFFE98-80CFFEB8 -00001 0020+00 1/0 0/0 0/0 .data * Mthd_Table__Q212daObjSwpush229@unnamed@d_a_obj_swpush2_cpp@ */ -SECTION_DATA static void* data_80CFFE98[8] = { - (void*)func_80CFFB50, (void*)func_80CFFB70, (void*)func_80CFFB90, (void*)NULL, - (void*)func_80CFFBB0, (void*)NULL, (void*)NULL, (void*)NULL, +static actor_method_class data_80CFFE98 = { + (process_method_func)func_80CFFB50, + (process_method_func)func_80CFFB70, + (process_method_func)func_80CFFB90, + 0, + (process_method_func)func_80CFFBB0, }; /* 80CFFEB8-80CFFEE8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Swpush2 */ -SECTION_DATA extern void* g_profile_Obj_Swpush2[12] = { - (void*)0xFFFFFFFD, (void*)0x0002FFFD, (void*)0x00170000, (void*)&g_fpcLf_Method, - (void*)0x000005F4, (void*)NULL, (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x000C0000, (void*)&data_80CFFE98, (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Swpush2 = { + fpcLy_CURRENT_e, // mLayerID + 2, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Swpush2, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjSwpush2), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 12, // mPriority + &data_80CFFE98, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80CFFEE8-80CFFEF4 000148 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ @@ -741,7 +560,8 @@ asm void daObjSwpush2::Act_c::create_heap() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_swpush5/d_a_obj_swpush5.cpp b/rel/d/a/obj/d_a_obj_swpush5/d_a_obj_swpush5.cpp index 146c396ce50..c64edf6c3bf 100644 --- a/rel/d/a/obj/d_a_obj_swpush5/d_a_obj_swpush5.cpp +++ b/rel/d/a/obj/d_a_obj_swpush5/d_a_obj_swpush5.cpp @@ -1,154 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_swpush5 -// +/** + * @file d_a_obj_swpush5.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_swpush5/d_a_obj_swpush5.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; - /* 8059C658 */ ~cXyz(); -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjSw5_c { - /* 8059B804 */ void initBaseMtx(); - /* 8059B88C */ void setBaseMtx(); - /* 8059B920 */ void Create(); - /* 8059BA1C */ void CreateHeap(); - /* 8059BB1C */ void create(); - /* 8059BBD4 */ void Execute(f32 (**)[3][4]); - /* 8059BC70 */ void setting_ride_flag(); - /* 8059BD24 */ bool checkPushable(); - /* 8059BD2C */ void event_proc_call(); - /* 8059BE18 */ void actionPauseNoneInit(); - /* 8059BE24 */ void actionPauseNone(); - /* 8059BE28 */ void actionPauseOrderInit(); - /* 8059BE80 */ void actionPauseOrder(); - /* 8059BEB4 */ void actionPauseInit(); - /* 8059BEE0 */ void actionPause(); - /* 8059BF48 */ void actionWait(); - /* 8059BF4C */ void actionOrder(); - /* 8059BF50 */ void actionEvent(); - /* 8059BF54 */ void calc_top_pos(); - /* 8059BFE4 */ void mode_proc_call(); - /* 8059C0A0 */ void modeWaitLowerInit(); - /* 8059C0C8 */ void modeWaitLower(); - /* 8059C23C */ void modeLowerInit(); - /* 8059C2D0 */ void modeLower(); - /* 8059C364 */ void modeWaitUpperInit(); - /* 8059C370 */ void modeWaitUpper(); - /* 8059C3C4 */ void modeUpperInit(); - /* 8059C454 */ void modeUpper(); - /* 8059C4BC */ void Draw(); - /* 8059C560 */ void Delete(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 800352B0 */ void offSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DSys { - static u8 mCurrentMtx[48]; -}; - -struct J3DModel {}; - -struct J3DJoint {}; // // Forward References: @@ -234,9 +91,6 @@ extern "C" void ChkUsed__9cBgW_BgIdCFv(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_27(); extern "C" void _savegpr_28(); @@ -244,12 +98,8 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -629,25 +479,30 @@ SECTION_DATA static u8 l_mode_func[48] = { #pragma pop /* 8059C7F0-8059C810 -00001 0020+00 1/0 0/0 0/0 .data l_daObjSw5_Method */ -SECTION_DATA static void* l_daObjSw5_Method[8] = { - (void*)daObjSw5_Create__FP10fopAc_ac_c, - (void*)daObjSw5_Delete__FP10daObjSw5_c, - (void*)daObjSw5_Execute__FP10daObjSw5_c, - (void*)NULL, - (void*)daObjSw5_Draw__FP10daObjSw5_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjSw5_Method = { + (process_method_func)daObjSw5_Create__FP10fopAc_ac_c, + (process_method_func)daObjSw5_Delete__FP10daObjSw5_c, + (process_method_func)daObjSw5_Execute__FP10daObjSw5_c, + 0, + (process_method_func)daObjSw5_Draw__FP10daObjSw5_c, }; /* 8059C810-8059C840 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Swpush5 */ -SECTION_DATA extern void* g_profile_Obj_Swpush5[12] = { - (void*)0xFFFFFFFD, (void*)0x0002FFFD, - (void*)0x00180000, (void*)&g_fpcLf_Method, - (void*)0x00000600, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x000D0000, (void*)&l_daObjSw5_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Swpush5 = { + fpcLy_CURRENT_e, // mLayerID + 2, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Swpush5, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjSw5_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 13, // mPriority + &l_daObjSw5_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 8059C840-8059C868 000164 0028+00 1/1 0/0 0/0 .data __vt__10daObjSw5_c */ @@ -984,7 +839,8 @@ static asm void daObjSw5_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swpush5/d_a_obj_swpush5/__dt__4cXyzFv.s" } diff --git a/rel/d/a/obj/d_a_obj_swturn/d_a_obj_swturn.cpp b/rel/d/a/obj/d_a_obj_swturn/d_a_obj_swturn.cpp index 0acff02c576..4fc7a1a1088 100644 --- a/rel/d/a/obj/d_a_obj_swturn/d_a_obj_swturn.cpp +++ b/rel/d/a/obj/d_a_obj_swturn/d_a_obj_swturn.cpp @@ -1,113 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_swturn -// +/** + * @file d_a_obj_swturn.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_swturn/d_a_obj_swturn.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjSwTurn_c { - /* 80D00CD8 */ void initBaseMtx(); - /* 80D00D14 */ void setBaseMtx(); - /* 80D00D78 */ void Create(); - /* 80D00EE4 */ void CreateHeap(); - /* 80D00F64 */ void create1st(); - /* 80D01074 */ void Execute(f32 (**)[3][4]); - /* 80D010D4 */ void mode_proc_call(); - /* 80D01160 */ void init_modeWait(); - /* 80D01198 */ void modeWait(); - /* 80D01770 */ void init_modeRotate(); - /* 80D018B4 */ void modeRotate(); - /* 80D01958 */ void rotate_sub_0(); - /* 80D01B60 */ void rotate_sub_1(); - /* 80D01EB0 */ void Draw(); - /* 80D01F58 */ void Delete(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 800352B0 */ void offSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW_Base { - struct PushPullLabel {}; -}; - -struct dBgW {}; -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -169,19 +68,13 @@ extern "C" void cLib_addCalcAngleS__FPsssss(); extern "C" void cLib_addCalcAngleS2__FPssss(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_27(); extern "C" void _savegpr_29(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_80D021A0[4]; @@ -529,25 +422,30 @@ asm void daObjSwTurn_c::Delete() { /* ############################################################################################## */ /* 80D02124-80D02144 -00001 0020+00 1/0 0/0 0/0 .data daObjSwTurn_METHODS */ -SECTION_DATA static void* daObjSwTurn_METHODS[8] = { - (void*)daObjSwTurn_create1st__FP13daObjSwTurn_c, - (void*)daObjSwTurn_MoveBGDelete__FP13daObjSwTurn_c, - (void*)daObjSwTurn_MoveBGExecute__FP13daObjSwTurn_c, - (void*)NULL, - (void*)daObjSwTurn_MoveBGDraw__FP13daObjSwTurn_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjSwTurn_METHODS = { + (process_method_func)daObjSwTurn_create1st__FP13daObjSwTurn_c, + (process_method_func)daObjSwTurn_MoveBGDelete__FP13daObjSwTurn_c, + (process_method_func)daObjSwTurn_MoveBGExecute__FP13daObjSwTurn_c, + 0, + (process_method_func)daObjSwTurn_MoveBGDraw__FP13daObjSwTurn_c, }; /* 80D02144-80D02174 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_SwTurn */ -SECTION_DATA extern void* g_profile_Obj_SwTurn[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x001E0000, (void*)&g_fpcLf_Method, - (void*)0x000005E0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x000E0000, (void*)&daObjSwTurn_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_SwTurn = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_SwTurn, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjSwTurn_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 14, // mPriority + &daObjSwTurn_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D02174-80D0219C 0000A8 0028+00 1/1 0/0 0/0 .data __vt__13daObjSwTurn_c */ diff --git a/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock.cpp b/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock.cpp index 432f06c95d6..3718dfe9a35 100644 --- a/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock.cpp +++ b/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock.cpp @@ -1,249 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_syRock -// +/** + * @file d_a_obj_syRock.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80D02334 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daWtPillar_c { - /* 80D03D90 */ void getPos(); - /* 80D2DDB0 */ void getPillarHeight(); -}; - -struct daSyRock_c { - /* 80D0237C */ void setBaseMtx(); - /* 80D02454 */ void CreateHeap(); - /* 80D02584 */ void create(); - /* 80D02AFC */ void setFallStat(); - /* 80D02BE0 */ void Execute(f32 (**)[3][4]); - /* 80D02C54 */ void move(); - /* 80D02E70 */ void init_modeWait(); - /* 80D02E7C */ void modeWait(); - /* 80D02F88 */ void eventStart(); - /* 80D02FB8 */ void init_modeDropInit(); - /* 80D03070 */ void modeDropInit(); - /* 80D030A8 */ void searchWaterPillar(void*, void*); - /* 80D03250 */ void init_modeDrop(); - /* 80D03384 */ void modeDrop(); - /* 80D033D0 */ void init_modeSink(); - /* 80D03440 */ void modeSink(); - /* 80D034E8 */ void init_modeMove(); - /* 80D035F8 */ void modeMove(); - /* 80D036B8 */ void chkWaterLineIn(); - /* 80D036DC */ void bgCheck(); - /* 80D03984 */ void init_modeDropEnd(); - /* 80D03A48 */ void modeDropEnd(); - /* 80D03A4C */ void Draw(); - /* 80D03B08 */ void Delete(); - /* 80D03DAC */ ~daSyRock_c(); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; -}; - -struct daSyRock_HIO_c { - /* 80D022AC */ daSyRock_HIO_c(); - /* 80D03C44 */ ~daSyRock_HIO_c(); -}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dEvLib_callback_c { - /* 8004886C */ void eventUpdate(); - /* 80048940 */ void orderEvent(int, int, int); - /* 80D03D30 */ ~dEvLib_callback_c(); - /* 80D03D78 */ bool eventStart(); - /* 80D03D80 */ bool eventRun(); - /* 80D03D88 */ bool eventEnd(); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80D02AA0 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 80084548 */ void GetTgHitGObj(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80D02930 */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80D029A0 */ ~dBgS_AcchCir(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80D02A10 */ ~cM3dGCyl(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 80D02A58 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80D03BFC */ ~cCcD_GStts(); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -371,10 +135,6 @@ extern "C" void cLib_addCalcAngleS__FPsssss(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSVECScale(); -extern "C" void PSVECSquareMag(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_26(); extern "C" void _savegpr_28(); @@ -382,8 +142,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -392,10 +150,7 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); extern "C" void getPillarHeight__12daWtPillar_cFv(); @@ -569,25 +324,30 @@ SECTION_DATA static u8 mode_proc[72] = { #pragma pop /* 80D04130-80D04150 -00001 0020+00 1/0 0/0 0/0 .data l_daSyRock_Method */ -SECTION_DATA static void* l_daSyRock_Method[8] = { - (void*)daSyRock_Create__FP10fopAc_ac_c, - (void*)daSyRock_Delete__FP10daSyRock_c, - (void*)daSyRock_Execute__FP10daSyRock_c, - (void*)NULL, - (void*)daSyRock_Draw__FP10daSyRock_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daSyRock_Method = { + (process_method_func)daSyRock_Create__FP10fopAc_ac_c, + (process_method_func)daSyRock_Delete__FP10daSyRock_c, + (process_method_func)daSyRock_Execute__FP10daSyRock_c, + 0, + (process_method_func)daSyRock_Draw__FP10daSyRock_c, }; /* 80D04150-80D04180 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_SyRock */ -SECTION_DATA extern void* g_profile_Obj_SyRock[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00450000, (void*)&g_fpcLf_Method, - (void*)0x000009A0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02030000, (void*)&l_daSyRock_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_SyRock = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_SyRock, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daSyRock_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 515, // mPriority + &l_daSyRock_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D04180-80D0418C 000144 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -698,7 +458,8 @@ asm daSyRock_HIO_c::daSyRock_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock/__dt__14mDoHIO_entry_cFv.s" } @@ -774,7 +535,8 @@ asm void daSyRock_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock/__dt__12dBgS_ObjAcchFv.s" } @@ -784,7 +546,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock/__dt__12dBgS_AcchCirFv.s" } @@ -794,7 +557,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock/__dt__8cM3dGCylFv.s" } @@ -804,7 +568,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock/__dt__8cM3dGAabFv.s" } @@ -814,7 +579,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock/__dt__10dCcD_GSttsFv.s" } @@ -1160,7 +926,8 @@ static asm void daSyRock_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock/__dt__10cCcD_GSttsFv.s" } @@ -1235,7 +1002,8 @@ static asm void func_80D03D28() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dEvLib_callback_c::~dEvLib_callback_c() { +// asm dEvLib_callback_c::~dEvLib_callback_c() { +extern "C" asm void __dt__17dEvLib_callback_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock/__dt__17dEvLib_callback_cFv.s" } @@ -1243,17 +1011,20 @@ asm dEvLib_callback_c::~dEvLib_callback_c() { /* 80D03D78-80D03D80 001BB8 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventStart() { +// bool dEvLib_callback_c::eventStart() { +extern "C" bool eventStart__17dEvLib_callback_cFv() { return true; } /* 80D03D80-80D03D88 001BC0 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventRun() { +// bool dEvLib_callback_c::eventRun() { +extern "C" bool eventRun__17dEvLib_callback_cFv() { return true; } /* 80D03D88-80D03D90 001BC8 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventEnd() { +// bool dEvLib_callback_c::eventEnd() { +extern "C" bool eventEnd__17dEvLib_callback_cFv() { return true; } @@ -1261,7 +1032,8 @@ bool dEvLib_callback_c::eventEnd() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daWtPillar_c::getPos() { +// asm void daWtPillar_c::getPos() { +extern "C" asm void getPos__12daWtPillar_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock/getPos__12daWtPillar_cFv.s" } diff --git a/rel/d/a/obj/d_a_obj_szbridge/d_a_obj_szbridge.cpp b/rel/d/a/obj/d_a_obj_szbridge/d_a_obj_szbridge.cpp index 254ba116e24..ed1371cf2f1 100644 --- a/rel/d/a/obj/d_a_obj_szbridge/d_a_obj_szbridge.cpp +++ b/rel/d/a/obj/d_a_obj_szbridge/d_a_obj_szbridge.cpp @@ -1,110 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_szbridge -// +/** + * @file d_a_obj_szbridge.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_szbridge/d_a_obj_szbridge.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjSZbridge_c { - /* 80D04360 */ void rideActor(fopAc_ac_c*); - /* 80D04424 */ void create1st(); - /* 80D044B8 */ void setMtx(); - /* 80D04528 */ void CreateHeap(); - /* 80D04598 */ void chkBg(); - /* 80D048C4 */ void Create(); - /* 80D04974 */ void Execute(f32 (**)[3][4]); - /* 80D049E4 */ void Draw(); - /* 80D04A88 */ void Delete(); - /* 80D04B90 */ ~daObjSZbridge_c(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW {}; - -struct dBgS_WtrChk { - /* 80079164 */ dBgS_WtrChk(); - /* 80D047D4 */ ~dBgS_WtrChk(); -}; - -struct dBgS_SplGrpChk { - /* 80078B90 */ void Set(cXyz&, f32); - /* 80078C78 */ ~dBgS_SplGrpChk(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjGndChk { - /* 80D0484C */ ~dBgS_ObjGndChk(); -}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct dBgS { - /* 80075564 */ void SplGrpChk(dBgS_SplGrpChk*); -}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; - -struct cBgS { - /* 800744A0 */ void GroundCross(cBgS_GndChk*); -}; - -struct J3DModel {}; // // Forward References: @@ -170,19 +71,11 @@ extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP extern "C" void cM_rndF__Ff(); extern "C" void SetPos__11cBgS_GndChkFPC4cXyz(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSVECSquareMag(); extern "C" void _savegpr_26(); extern "C" void _restgpr_26(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; // // Declarations: @@ -337,25 +230,30 @@ COMPILER_STRIP_GATE(0x80D04C78, &lit_3720); #pragma pop /* 80D04C90-80D04CB0 -00001 0020+00 1/0 0/0 0/0 .data daObjSZbridge_METHODS */ -SECTION_DATA static void* daObjSZbridge_METHODS[8] = { - (void*)daObjSZbridge_create1st__FP15daObjSZbridge_c, - (void*)daObjSZbridge_MoveBGDelete__FP15daObjSZbridge_c, - (void*)daObjSZbridge_MoveBGExecute__FP15daObjSZbridge_c, - (void*)NULL, - (void*)daObjSZbridge_MoveBGDraw__FP15daObjSZbridge_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjSZbridge_METHODS = { + (process_method_func)daObjSZbridge_create1st__FP15daObjSZbridge_c, + (process_method_func)daObjSZbridge_MoveBGDelete__FP15daObjSZbridge_c, + (process_method_func)daObjSZbridge_MoveBGExecute__FP15daObjSZbridge_c, + 0, + (process_method_func)daObjSZbridge_MoveBGDraw__FP15daObjSZbridge_c, }; /* 80D04CB0-80D04CE0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_SZbridge */ -SECTION_DATA extern void* g_profile_Obj_SZbridge[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00D90000, (void*)&g_fpcLf_Method, - (void*)0x00000624, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02A40000, (void*)&daObjSZbridge_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_SZbridge = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_SZbridge, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjSZbridge_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 676, // mPriority + &daObjSZbridge_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D04CE0-80D04D10 000054 0030+00 2/2 0/0 0/0 .data __vt__11dBgS_WtrChk */ @@ -404,7 +302,8 @@ asm void daObjSZbridge_c::chkBg() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_WtrChk::~dBgS_WtrChk() { +// asm dBgS_WtrChk::~dBgS_WtrChk() { +extern "C" asm void __dt__11dBgS_WtrChkFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_szbridge/d_a_obj_szbridge/__dt__11dBgS_WtrChkFv.s" } @@ -414,7 +313,8 @@ asm dBgS_WtrChk::~dBgS_WtrChk() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +// asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +extern "C" asm void __dt__14dBgS_ObjGndChkFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_szbridge/d_a_obj_szbridge/__dt__14dBgS_ObjGndChkFv.s" } diff --git a/rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence.cpp b/rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence.cpp index 5f6ef2926fe..adf6c3f1f8a 100644 --- a/rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence.cpp +++ b/rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence.cpp @@ -1,176 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_taFence -// +/** + * @file d_a_obj_taFence.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80D04F44 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct daTaFence_c { - /* 80D04F8C */ void setBaseMtx(); - /* 80D0503C */ void CreateHeap(); - /* 80D050A8 */ void create(); - /* 80D05550 */ void Execute(f32 (**)[3][4]); - /* 80D055A0 */ void fenceProc(); - /* 80D057C4 */ void init_modeWait(); - /* 80D057D0 */ void modeWait(); - /* 80D05A54 */ void init_modeMoveInit(); - /* 80D05B5C */ void modeMoveInit(); - /* 80D05B94 */ void init_modeMove(); - /* 80D05CAC */ void modeMove(); - /* 80D05D2C */ void init_modeMoveEnd(); - /* 80D05E54 */ void modeMoveEnd(); - /* 80D05E58 */ void Draw(); - /* 80D05EFC */ void Delete(); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; -}; - -struct daTaFence_HIO_c { - /* 80D04E6C */ daTaFence_HIO_c(); - /* 80D06000 */ ~daTaFence_HIO_c(); -}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 800352B0 */ void offSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80D054F4 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 80084548 */ void GetTgHitGObj(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); - /* 80D05314 */ ~dCcD_Cyl(); - /* 80D053E0 */ dCcD_Cyl(); -}; - -struct dBgW_Base {}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80D05464 */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80D054AC */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80D05FB8 */ ~cCcD_GStts(); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -259,17 +95,12 @@ extern "C" void cLib_addCalcAngleS__FPsssss(); extern "C" void cLib_chaseF__FPfff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void __construct_array(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_24(); extern "C" void _savegpr_25(); extern "C" void _restgpr_24(); extern "C" void _restgpr_25(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -277,8 +108,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -456,25 +285,30 @@ SECTION_DATA static u8 mode_proc[48] = { #pragma pop /* 80D06268-80D06288 -00001 0020+00 1/0 0/0 0/0 .data l_daTaFence_Method */ -SECTION_DATA static void* l_daTaFence_Method[8] = { - (void*)daTaFence_Create__FP10fopAc_ac_c, - (void*)daTaFence_Delete__FP11daTaFence_c, - (void*)daTaFence_Execute__FP11daTaFence_c, - (void*)NULL, - (void*)daTaFence_Draw__FP11daTaFence_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daTaFence_Method = { + (process_method_func)daTaFence_Create__FP10fopAc_ac_c, + (process_method_func)daTaFence_Delete__FP11daTaFence_c, + (process_method_func)daTaFence_Execute__FP11daTaFence_c, + 0, + (process_method_func)daTaFence_Draw__FP11daTaFence_c, }; /* 80D06288-80D062B8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_TaFence */ -SECTION_DATA extern void* g_profile_Obj_TaFence[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x003F0000, (void*)&g_fpcLf_Method, - (void*)0x000013D4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01F90000, (void*)&l_daTaFence_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_TaFence = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_TaFence, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daTaFence_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 505, // mPriority + &l_daTaFence_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D062B8-80D062C4 000114 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -547,7 +381,8 @@ asm daTaFence_HIO_c::daTaFence_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence/__dt__14mDoHIO_entry_cFv.s" } @@ -594,7 +429,8 @@ asm void daTaFence_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Cyl::~dCcD_Cyl() { +// asm dCcD_Cyl::~dCcD_Cyl() { +extern "C" asm void __dt__8dCcD_CylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence/__dt__8dCcD_CylFv.s" } @@ -604,7 +440,8 @@ asm dCcD_Cyl::~dCcD_Cyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Cyl::dCcD_Cyl() { +// asm dCcD_Cyl::dCcD_Cyl() { +extern "C" asm void __ct__8dCcD_CylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence/__ct__8dCcD_CylFv.s" } @@ -614,7 +451,8 @@ asm dCcD_Cyl::dCcD_Cyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence/__dt__8cM3dGCylFv.s" } @@ -624,7 +462,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence/__dt__8cM3dGAabFv.s" } @@ -634,7 +473,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence/__dt__10dCcD_GSttsFv.s" } @@ -884,7 +724,8 @@ static asm void daTaFence_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_takaraDai/d_a_obj_takaraDai.cpp b/rel/d/a/obj/d_a_obj_takaraDai/d_a_obj_takaraDai.cpp index 1bfdb4433d1..d4b03a653af 100644 --- a/rel/d/a/obj/d_a_obj_takaraDai/d_a_obj_takaraDai.cpp +++ b/rel/d/a/obj/d_a_obj_takaraDai/d_a_obj_takaraDai.cpp @@ -1,113 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_takaraDai -// +/** + * @file d_a_obj_takaraDai.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_takaraDai/d_a_obj_takaraDai.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80D06E1C */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct daTkraDai_c { - /* 80D06E64 */ void setBaseMtx(); - /* 80D06FFC */ void CreateHeap(); - /* 80D07140 */ void create(); - /* 80D07344 */ void Execute(f32 (**)[3][4]); - /* 80D073A4 */ void procMain(); - /* 80D074D0 */ void init_modeWait(); - /* 80D07528 */ void modeWait(); - /* 80D075A4 */ void Draw(); - /* 80D07668 */ void Delete(); -}; - -struct daTkraDai_HIO_c { - /* 80D06D8C */ daTkraDai_HIO_c(); - /* 80D0775C */ ~daTkraDai_HIO_c(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -166,18 +65,11 @@ extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP extern "C" void ChkUsed__9cBgW_BgIdCFv(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" void __register_global_object(); @@ -280,25 +172,30 @@ SECTION_DATA static u8 mode_proc[12] = { }; /* 80D07878-80D07898 -00001 0020+00 1/0 0/0 0/0 .data l_daTkraDai_Method */ -SECTION_DATA static void* l_daTkraDai_Method[8] = { - (void*)daTkraDai_Create__FP10fopAc_ac_c, - (void*)daTkraDai_Delete__FP11daTkraDai_c, - (void*)daTkraDai_Execute__FP11daTkraDai_c, - (void*)NULL, - (void*)daTkraDai_Draw__FP11daTkraDai_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daTkraDai_Method = { + (process_method_func)daTkraDai_Create__FP10fopAc_ac_c, + (process_method_func)daTkraDai_Delete__FP11daTkraDai_c, + (process_method_func)daTkraDai_Execute__FP11daTkraDai_c, + 0, + (process_method_func)daTkraDai_Draw__FP11daTkraDai_c, }; /* 80D07898-80D078C8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_TakaraDai */ -SECTION_DATA extern void* g_profile_Obj_TakaraDai[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00B70000, (void*)&g_fpcLf_Method, - (void*)0x0000065C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x028E0000, (void*)&l_daTkraDai_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_TakaraDai = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_TakaraDai, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daTkraDai_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 654, // mPriority + &l_daTkraDai_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D078C8-80D078F0 000068 0028+00 1/1 0/0 0/0 .data __vt__11daTkraDai_c */ @@ -343,7 +240,8 @@ asm daTkraDai_HIO_c::daTkraDai_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_takaraDai/d_a_obj_takaraDai/__dt__14mDoHIO_entry_cFv.s" } diff --git a/rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.cpp b/rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.cpp index b3de89019ce..2b0e93f0c32 100644 --- a/rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.cpp +++ b/rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.cpp @@ -1,71 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_tatigi -// +/** + * @file d_a_obj_tatigi.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct tg_ss { - /* 80D083C0 */ ~tg_ss(); - /* 80D08494 */ tg_ss(); -}; - -struct request_of_phase_process_class {}; - -struct obj_tatigi_class {}; - -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct J3DModel {}; - -struct J3DModelData {}; - -struct dComIfG_play_c { - /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); - /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); - /* 8002CB68 */ void entrySimpleModel(J3DModel*, int); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_GndChk { - /* 80267D0C */ void SetPos(Vec const*); -}; - -struct cBgS { - /* 800744A0 */ void GroundCross(cBgS_GndChk*); -}; -struct JMath { - static u8 sincosTable_[65536]; -}; // // Forward References: @@ -126,8 +68,6 @@ extern "C" void MtxPosition__FP4cXyzP4cXyz(); extern "C" void MtxPush__Fv(); extern "C" void MtxPull__Fv(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __construct_array(); extern "C" void _savegpr_23(); extern "C" void _savegpr_25(); @@ -137,8 +77,6 @@ extern "C" void _restgpr_23(); extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -388,25 +326,30 @@ static asm void daObj_Tatigi_Create(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80D0866C-80D0868C -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Tatigi_Method */ -SECTION_DATA static void* l_daObj_Tatigi_Method[8] = { - (void*)daObj_Tatigi_Create__FP10fopAc_ac_c, - (void*)daObj_Tatigi_Delete__FP16obj_tatigi_class, - (void*)daObj_Tatigi_Execute__FP16obj_tatigi_class, - (void*)daObj_Tatigi_IsDelete__FP16obj_tatigi_class, - (void*)daObj_Tatigi_Draw__FP16obj_tatigi_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObj_Tatigi_Method = { + (process_method_func)daObj_Tatigi_Create__FP10fopAc_ac_c, + (process_method_func)daObj_Tatigi_Delete__FP16obj_tatigi_class, + (process_method_func)daObj_Tatigi_Execute__FP16obj_tatigi_class, + (process_method_func)daObj_Tatigi_IsDelete__FP16obj_tatigi_class, + (process_method_func)daObj_Tatigi_Draw__FP16obj_tatigi_class, }; /* 80D0868C-80D086BC -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_TATIGI */ -SECTION_DATA extern void* g_profile_OBJ_TATIGI[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01170000, (void*)&g_fpcLf_Method, - (void*)0x00001BC0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02C50000, (void*)&l_daObj_Tatigi_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_TATIGI = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_TATIGI, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(obj_tatigi_class), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 709, // mPriority + &l_daObj_Tatigi_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D086BC-80D086C8 000094 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */ diff --git a/rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.cpp b/rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.cpp index f913740cbb2..8d34109acf2 100644 --- a/rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.cpp +++ b/rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.cpp @@ -1,222 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_ten -// +/** + * @file d_a_obj_ten.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF0C */ void ZXYrotS(csXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; - -struct mDoExt_McaMorfSO { - /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, - int, Z2Creature*, u32, u32); - /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32); - /* 800110B0 */ void play(u32, s8); - /* 800111C0 */ void entryDL(); - /* 800111EC */ void modelCalc(); -}; - -struct fopAc_ac_c {}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static f32 mGroundY; -}; - -struct daPy_boomerangMove_c { - /* 8015E5B0 */ void initOffset(cXyz const*); - /* 8015E654 */ void posMove(cXyz*, s16*, fopAc_ac_c*, s16); - /* 8015E87C */ void bgCheckAfterOffset(cXyz const*); -}; - -struct daObj_TenHIO_c { - /* 80D087CC */ daObj_TenHIO_c(); - /* 80D0B848 */ ~daObj_TenHIO_c(); -}; - -struct daObjTEN_c { - /* 80D087F4 */ void InitCcSph(); - /* 80D08860 */ void SetCcSph(); - /* 80D08C10 */ void WaitAction(); - /* 80D08D94 */ void WallCheck(); - /* 80D09008 */ void SpeedSet(); - /* 80D09114 */ void WallWalk(); - /* 80D09548 */ void WalkAction(); - /* 80D09748 */ void MoveAction(); - /* 80D09F58 */ void Action(); - /* 80D0A01C */ void ShopAction(); - /* 80D0A0D8 */ void checkGroundPos(); - /* 80D0A13C */ void Insect_Release(); - /* 80D0A154 */ void ParticleSet(); - /* 80D0A278 */ void BoomChk(); - /* 80D0A644 */ void Execute(); - /* 80D0A8C8 */ void ObjHit(); - /* 80D0AA50 */ void Z_BufferChk(); - /* 80D0ABCC */ void Delete(); - /* 80D0AC34 */ void setBaseMtx(); - /* 80D0AD9C */ void CreateChk(); - /* 80D0AF48 */ void create(); -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dMenu_Insect_c { - /* 801D9F3C */ void isCatchNotGiveInsect(u8); -}; - -struct dInsect_c { - /* 8015E010 */ dInsect_c(); - /* 8015E078 */ void Insect_GetDemoMain(); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dDlst_peekZ_c { - /* 80056018 */ void newData(s16, s16, u32*); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80D0B740 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); -}; - -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_PolyInfo {}; - -struct cBgS_LinChk {}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 800744A0 */ void GroundCross(cBgS_GndChk*); - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct _GXTexObj {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80D08B84 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -344,16 +135,12 @@ extern "C" void init__10Z2CreatureFP3VecP3VecUcUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void _savegpr_24(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_24(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -363,7 +150,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" void __register_global_object(); @@ -377,25 +163,30 @@ SECTION_RODATA static f32 const lit_3775 = 1.0f; COMPILER_STRIP_GATE(0x80D0B8F0, &lit_3775); /* 80D0B9F4-80D0BA14 -00001 0020+00 1/0 0/0 0/0 .data l_daObjTEN_Method */ -SECTION_DATA static void* l_daObjTEN_Method[8] = { - (void*)daObjTEN_Create__FP10fopAc_ac_c, - (void*)daObjTEN_Delete__FP10daObjTEN_c, - (void*)daObjTEN_Execute__FP10daObjTEN_c, - (void*)daObjTEN_IsDelete__FP10daObjTEN_c, - (void*)daObjTEN_Draw__FP10daObjTEN_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjTEN_Method = { + (process_method_func)daObjTEN_Create__FP10fopAc_ac_c, + (process_method_func)daObjTEN_Delete__FP10daObjTEN_c, + (process_method_func)daObjTEN_Execute__FP10daObjTEN_c, + (process_method_func)daObjTEN_IsDelete__FP10daObjTEN_c, + (process_method_func)daObjTEN_Draw__FP10daObjTEN_c, }; /* 80D0BA14-80D0BA44 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Ten */ -SECTION_DATA extern void* g_profile_Obj_Ten[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01460000, (void*)&g_fpcLf_Method, - (void*)0x00000A68, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01E30000, (void*)&l_daObjTEN_Method, - (void*)0x000C0120, (void*)0x030E0000, +extern actor_process_profile_definition g_profile_Obj_Ten = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Ten, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjTEN_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 483, // mPriority + &l_daObjTEN_Method, // sub_method + 0x000C0120, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D0BA44-80D0BA68 000050 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ @@ -531,7 +322,8 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ten/d_a_obj_ten/__dt__12J3DFrameCtrlFv.s" } @@ -1070,7 +862,8 @@ asm void daObjTEN_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ten/d_a_obj_ten/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_testcube/d_a_obj_testcube.cpp b/rel/d/a/obj/d_a_obj_testcube/d_a_obj_testcube.cpp index f250b768367..fd4375065b4 100644 --- a/rel/d/a/obj/d_a_obj_testcube/d_a_obj_testcube.cpp +++ b/rel/d/a/obj/d_a_obj_testcube/d_a_obj_testcube.cpp @@ -1,32 +1,26 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_testcube -// +/** + * @file d_a_obj_testcube.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_testcube/d_a_obj_testcube.h" #include "dol2asm.h" -// -// Forward References: -// - -extern "C" extern void* g_profile_Obj_TestCube[12]; - -// -// External References: -// - -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; - -// -// Declarations: -// - /* ############################################################################################## */ /* 80D0BB60-80D0BB90 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_TestCube */ -SECTION_DATA extern void* g_profile_Obj_TestCube[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, (void*)0x00540000, (void*)&g_fpcLf_Method, - (void*)0x000005A0, (void*)NULL, (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01BA0000, (void*)NULL, (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_TestCube = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_TestCube, // mProcName + &g_fpcLf_Method.mBase, // sub_method + 0x000005A0, // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 442, // mPriority + NULL, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/obj/d_a_obj_thashi/d_a_obj_thashi.cpp b/rel/d/a/obj/d_a_obj_thashi/d_a_obj_thashi.cpp index 08ac171fa14..d102f76cbe6 100644 --- a/rel/d/a/obj/d_a_obj_thashi/d_a_obj_thashi.cpp +++ b/rel/d/a/obj/d_a_obj_thashi/d_a_obj_thashi.cpp @@ -1,115 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_thashi -// +/** + * @file d_a_obj_thashi.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_thashi/d_a_obj_thashi.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz { - /* 80D0C318 */ ~csXyz(); - /* 80D0CE60 */ csXyz(); -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjTHASHI_c { - /* 80D0C238 */ void initCcCylinder(); - /* 80D0C354 */ void setBaseMtx(); - /* 80D0C654 */ void CreateHeap(); - /* 80D0C8B4 */ void create(); - /* 80D0CE70 */ void Create(); - /* 80D0CEB4 */ void Execute(f32 (**)[3][4]); - /* 80D0CEE0 */ void Draw(); - /* 80D0D140 */ void Delete(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); - /* 8003C6B8 */ void getObjectResName2Index(char const*, char const*); -}; - -struct dBgW { - /* 8007B970 */ dBgW(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80D0CDF0 */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); - - static u8 m_set_func[4 + 4 /* padding */]; -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -187,8 +84,6 @@ extern "C" void SetC__8cM3dGCylFRC4cXyz(); extern "C" void __ct__16Z2SoundObjSimpleFv(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __construct_array(); extern "C" void _savegpr_25(); extern "C" void _savegpr_26(); @@ -198,8 +93,6 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -209,8 +102,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 m_set_func__16dBgS_MoveBgActor[4 + 4 /* padding */]; @@ -329,7 +220,8 @@ extern "C" asm void __dt__4cXyzFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm csXyz::~csXyz() { +// asm csXyz::~csXyz() { +extern "C" asm void __dt__5csXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_thashi/d_a_obj_thashi/__dt__5csXyzFv.s" } @@ -660,25 +552,30 @@ SECTION_DEAD static char const* const stringBase_80D0D324 = "S_thashi00.dzb"; #pragma pop /* 80D0D35C-80D0D37C -00001 0020+00 1/0 0/0 0/0 .data l_daObjTHASHI_Method */ -SECTION_DATA static void* l_daObjTHASHI_Method[8] = { - (void*)daObjTHASHI_Create__FP10fopAc_ac_c, - (void*)daObjTHASHI_Delete__FP13daObjTHASHI_c, - (void*)daObjTHASHI_Execute__FP13daObjTHASHI_c, - (void*)daObjTHASHI_IsDelete__FP13daObjTHASHI_c, - (void*)daObjTHASHI_Draw__FP13daObjTHASHI_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjTHASHI_Method = { + (process_method_func)daObjTHASHI_Create__FP10fopAc_ac_c, + (process_method_func)daObjTHASHI_Delete__FP13daObjTHASHI_c, + (process_method_func)daObjTHASHI_Execute__FP13daObjTHASHI_c, + (process_method_func)daObjTHASHI_IsDelete__FP13daObjTHASHI_c, + (process_method_func)daObjTHASHI_Draw__FP13daObjTHASHI_c, }; /* 80D0D37C-80D0D3AC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_THASHI */ -SECTION_DATA extern void* g_profile_Obj_THASHI[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x006E0000, (void*)&g_fpcLf_Method, - (void*)0x00001BBC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01CD0000, (void*)&l_daObjTHASHI_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_THASHI = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_THASHI, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjTHASHI_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 461, // mPriority + &l_daObjTHASHI_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D0D3AC-80D0D3B8 000078 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGSph */ @@ -798,14 +695,16 @@ extern "C" asm void __dt__8cM3dGSphFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_thashi/d_a_obj_thashi/__dt__12dBgS_ObjAcchFv.s" } #pragma pop /* 80D0CE60-80D0CE64 000CA0 0004+00 1/1 0/0 0/0 .text __ct__5csXyzFv */ -csXyz::csXyz() { +// csXyz::csXyz() { +extern "C" asm void __ct__5csXyzFv() { /* empty function */ } diff --git a/rel/d/a/obj/d_a_obj_thdoor/d_a_obj_thdoor.cpp b/rel/d/a/obj/d_a_obj_thdoor/d_a_obj_thdoor.cpp index c5259a7ccda..7075cebb241 100644 --- a/rel/d/a/obj/d_a_obj_thdoor/d_a_obj_thdoor.cpp +++ b/rel/d/a/obj/d_a_obj_thdoor/d_a_obj_thdoor.cpp @@ -1,128 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_thdoor -// +/** + * @file d_a_obj_thdoor.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_thdoor/d_a_obj_thdoor.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjThDoor_c { - /* 80D0D618 */ void initBaseMtx(); - /* 80D0D654 */ void setBaseMtx(); - /* 80D0D6B8 */ void Create(); - /* 80D0D7F8 */ void CreateHeap(); - /* 80D0D868 */ void create1st(); - /* 80D0D8E8 */ void Execute(f32 (**)[3][4]); - /* 80D0D9B4 */ void set_cyl(); - /* 80D0DAC8 */ void action(); - /* 80D0DB90 */ void event_proc_call(); - /* 80D0DC4C */ void actionWait(); - /* 80D0DCC8 */ void actionOrderEvent(); - /* 80D0DD90 */ void actionEvent(); - /* 80D0DE30 */ void actionDead(); - /* 80D0DE34 */ void demoProc(); - /* 80D0E06C */ void checkArea(); - /* 80D0E150 */ void Draw(); - /* 80D0E1F4 */ void Delete(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dMsgFlow_c { - /* 80249F00 */ dMsgFlow_c(); - /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**); - /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dEvent_manager_c { - /* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8); - /* 80047A78 */ void endCheck(s16); - /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int); - /* 80047D4C */ void getIsAddvance(int); - /* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int); - /* 800480EC */ void getMySubstanceP(int, char const*, int); - /* 8004817C */ void cutEnd(int); -}; - -struct dBgW_Base {}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct J3DModel {}; // // Forward References: @@ -216,17 +100,12 @@ extern "C" void cLib_chaseS__FPsss(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXInverse(); -extern "C" void PSMTXMultVec(); extern "C" void __construct_array(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_25(); extern "C" void _savegpr_27(); extern "C" void _restgpr_25(); extern "C" void _restgpr_27(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -234,8 +113,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_80D0E7E0[4]; @@ -629,25 +506,30 @@ asm void daObjThDoor_c::Delete() { /* ############################################################################################## */ /* 80D0E734-80D0E754 -00001 0020+00 1/0 0/0 0/0 .data daObjThDoor_METHODS */ -SECTION_DATA static void* daObjThDoor_METHODS[8] = { - (void*)daObjThDoor_create1st__FP13daObjThDoor_c, - (void*)daObjThDoor_MoveBGDelete__FP13daObjThDoor_c, - (void*)daObjThDoor_MoveBGExecute__FP13daObjThDoor_c, - (void*)NULL, - (void*)daObjThDoor_MoveBGDraw__FP13daObjThDoor_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjThDoor_METHODS = { + (process_method_func)daObjThDoor_create1st__FP13daObjThDoor_c, + (process_method_func)daObjThDoor_MoveBGDelete__FP13daObjThDoor_c, + (process_method_func)daObjThDoor_MoveBGExecute__FP13daObjThDoor_c, + 0, + (process_method_func)daObjThDoor_MoveBGDraw__FP13daObjThDoor_c, }; /* 80D0E754-80D0E784 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_TDoor */ -SECTION_DATA extern void* g_profile_Obj_TDoor[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00B40000, (void*)&g_fpcLf_Method, - (void*)0x000008C0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02300000, (void*)&daObjThDoor_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_TDoor = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_TDoor, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjThDoor_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 560, // mPriority + &daObjThDoor_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D0E784-80D0E790 00012C 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ diff --git a/rel/d/a/obj/d_a_obj_timeFire/d_a_obj_timeFire.cpp b/rel/d/a/obj/d_a_obj_timeFire/d_a_obj_timeFire.cpp index 1e243efe03d..20cf6b0100e 100644 --- a/rel/d/a/obj/d_a_obj_timeFire/d_a_obj_timeFire.cpp +++ b/rel/d/a/obj/d_a_obj_timeFire/d_a_obj_timeFire.cpp @@ -1,78 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_timeFire -// +/** + * @file d_a_obj_timeFire.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_timeFire/d_a_obj_timeFire.h" #include "dol2asm.h" -// -// Types: -// - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80D0E910 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daTimeFire_c { - /* 80D0E958 */ void setBaseMtx(); - /* 80D0E9B0 */ void create(); - /* 80D0EACC */ void lightInit(); - /* 80D0EB40 */ void setLight(); - /* 80D0EB64 */ void cutLight(); - /* 80D0EB88 */ void Execute(); - /* 80D0ED68 */ void fireCheck(u8); - /* 80D0EF88 */ bool Draw(); - /* 80D0EF90 */ void Delete(); -}; - -struct daTimeFire_HIO_c { - /* 80D0E8EC */ daTimeFire_HIO_c(); - /* 80D0F038 */ ~daTimeFire_HIO_c(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dPa_levelEcallBack {}; -struct dKy_tevstr_c {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct cXyz {}; - -struct dPa_control_c { - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct LIGHT_INFLUENCE {}; // // Forward References: @@ -113,11 +47,8 @@ extern "C" void dKy_plight_cut__FP15LIGHT_INFLUENCE(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXTrans(); extern "C" void _savegpr_28(); extern "C" void _restgpr_28(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -129,25 +60,30 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80D0F100-80D0F120 -00001 0020+00 1/0 0/0 0/0 .data l_daTimeFire_Method */ -SECTION_DATA static void* l_daTimeFire_Method[8] = { - (void*)daTimeFire_Create__FP10fopAc_ac_c, - (void*)daTimeFire_Delete__FP12daTimeFire_c, - (void*)daTimeFire_Execute__FP12daTimeFire_c, - (void*)NULL, - (void*)daTimeFire_Draw__FP12daTimeFire_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daTimeFire_Method = { + (process_method_func)daTimeFire_Create__FP10fopAc_ac_c, + (process_method_func)daTimeFire_Delete__FP12daTimeFire_c, + (process_method_func)daTimeFire_Execute__FP12daTimeFire_c, + 0, + (process_method_func)daTimeFire_Draw__FP12daTimeFire_c, }; /* 80D0F120-80D0F150 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_TimeFire */ -SECTION_DATA extern void* g_profile_Obj_TimeFire[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01940000, (void*)&g_fpcLf_Method, - (void*)0x000005C0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02950000, (void*)&l_daTimeFire_Method, - (void*)0x00060000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_TimeFire = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_TimeFire, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daTimeFire_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 661, // mPriority + &l_daTimeFire_Method, // sub_method + 0x00060000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D0F150-80D0F15C 000050 000C+00 2/2 0/0 0/0 .data __vt__16daTimeFire_HIO_c */ @@ -178,7 +114,8 @@ asm daTimeFire_HIO_c::daTimeFire_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_timeFire/d_a_obj_timeFire/__dt__14mDoHIO_entry_cFv.s" } diff --git a/rel/d/a/obj/d_a_obj_timer/d_a_obj_timer.cpp b/rel/d/a/obj/d_a_obj_timer/d_a_obj_timer.cpp index 14c4ef0ce28..b90b5b398d9 100644 --- a/rel/d/a/obj/d_a_obj_timer/d_a_obj_timer.cpp +++ b/rel/d/a/obj/d_a_obj_timer/d_a_obj_timer.cpp @@ -1,60 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_timer -// +/** + * @file d_a_obj_timer.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_timer/d_a_obj_timer.h" #include "dol2asm.h" -// -// Types: -// - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObjTimer { - struct Act_c { - struct Prm_e {}; - - /* 80485198 */ void _create(); - /* 8048526C */ bool _delete(); - /* 80485274 */ void mode_wait_init(); - /* 80485284 */ void mode_wait(); - /* 804852E0 */ void mode_count_init(); - /* 80485324 */ void mode_count(); - /* 804854BC */ void _execute(); - }; -}; - -struct daObj { - template - void PrmAbstract(/* ... */); - /* 8048561C */ /* daObj::PrmAbstract */ - void func_8048561C(void* _this, fopAc_ac_c const*, daObjTimer::Act_c::Prm_e, - daObjTimer::Act_c::Prm_e); -}; - -struct dSv_info_c { - /* 800352B0 */ void offSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct create_tag_class {}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - // // Forward References: // @@ -73,7 +24,6 @@ extern "C" static bool func_8048560C(); extern "C" static bool func_80485614(); extern "C" void func_8048561C(void* _this, fopAc_ac_c const*, daObjTimer::Act_c::Prm_e, daObjTimer::Act_c::Prm_e); -extern "C" extern void* g_profile_Obj_Timer[12]; // // External References: @@ -86,8 +36,6 @@ extern "C" void offSwitch__10dSv_info_cFii(); extern "C" void isSwitch__10dSv_info_cCFii(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __ptmf_scall(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_804856E8[4]; @@ -282,14 +230,28 @@ extern "C" asm void func_8048561C(void* _this, fopAc_ac_c const* param_0, /* ############################################################################################## */ /* 80485698-804856B8 -00001 0020+00 1/0 0/0 0/0 .data * Mthd_Table__Q210daObjTimer27@unnamed@d_a_obj_timer_cpp@ */ -SECTION_DATA static void* data_80485698[8] = { - (void*)func_804855A4, (void*)func_804855C4, (void*)func_804855E8, (void*)func_80485614, - (void*)func_8048560C, (void*)NULL, (void*)NULL, (void*)NULL, +static actor_method_class data_80485698 = { + (process_method_func)func_804855A4, + (process_method_func)func_804855C4, + (process_method_func)func_804855E8, + (process_method_func)func_80485614, + (process_method_func)func_8048560C, }; /* 804856B8-804856E8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Timer */ -SECTION_DATA extern void* g_profile_Obj_Timer[12] = { - (void*)0xFFFFFFFD, (void*)0x000AFFFD, (void*)0x030B0000, (void*)&g_fpcLf_Method, - (void*)0x00000574, (void*)NULL, (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00160000, (void*)&data_80485698, (void*)0x00040000, (void*)NULL, +extern actor_process_profile_definition g_profile_Obj_Timer = { + fpcLy_CURRENT_e, // mLayerID + 10, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Timer, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjTimer), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 22, // mPriority + &data_80485698, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_0_e, // cullType }; diff --git a/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.cpp b/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.cpp index 5fbcf2b0ea0..c889b6176e6 100644 --- a/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.cpp +++ b/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.cpp @@ -1,351 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_tks -// +/** + * @file d_a_obj_tks.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.h" #include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz { - /* 80D11FBC */ ~csXyz(); - /* 80D11FF8 */ csXyz(); -}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; - /* 80D11FFC */ ~cXyz(); - /* 80D12038 */ cXyz(); -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DModelData {}; - -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0420 */ ~Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; - -struct mDoExt_McaMorfSO { - /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, - int, Z2Creature*, u32, u32); - /* 800111EC */ void modelCalc(); - /* 80011310 */ void stopZelAnime(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct J3DModel {}; - -struct J3DJoint {}; - -struct daObjTks_c { - /* 80D0F28C */ daObjTks_c(); - /* 80D0F480 */ ~daObjTks_c(); - /* 80D0F640 */ void Create(); - /* 80D0F904 */ void CreateHeap(); - /* 80D0FD34 */ void Delete(); - /* 80D0FD68 */ void Execute(); - /* 80D0FE60 */ void Draw(); - /* 80D0FED0 */ void ctrlJoint(J3DJoint*, J3DModel*); - /* 80D10094 */ void createHeapCallBack(fopAc_ac_c*); - /* 80D100B4 */ void ctrlJointCallBack(J3DJoint*, int); - /* 80D10100 */ void setMtx(); - /* 80D10184 */ void setExpressionAnm(int, bool); - /* 80D102D0 */ void setExpressionBtp(int); - /* 80D103A4 */ void setMotion(int, f32, int); - /* 80D103E8 */ void reset(); - /* 80D10578 */ void setAction(void (daObjTks_c::*)()); - /* 80D10618 */ void wait(); - /* 80D106C8 */ void setExpression(int, f32); - /* 80D106F4 */ void talk(); - /* 80D10A80 */ void demo(); - /* 80D11104 */ void setMotionAnm(int, f32); - /* 80D11228 */ void warp(); - /* 80D11670 */ void setParam(); - /* 80D116C8 */ void main(); - /* 80D118E8 */ void ctrlBtk(); - /* 80D119BC */ void setAttnPos(); - /* 80D11CB4 */ void lookat(); - /* 80D11E94 */ bool drawDbgInfo(); - /* 80D11E9C */ void drawOtherMdls(); -}; - -struct daObjTks_Param_c { - /* 80D126D0 */ ~daObjTks_Param_c(); - - static u8 const m[128]; -}; - -struct J3DAnmTexPattern { - /* 8032AF50 */ void getTexNo(u16, u16*) const; -}; - -struct J3DAnmTextureSRTKey {}; - -struct J3DAnmTransformKey {}; - -struct _GXColorS10 {}; - -struct daNpcF_c { - struct daNpcF_anmPlayData {}; - - /* 80152014 */ void execute(); - /* 801522AC */ void draw(int, int, f32, _GXColorS10*, int); - /* 801527FC */ void setMtx2(); - /* 801528C8 */ void initialize(); - /* 80152B2C */ void getTrnsfrmKeyAnmP(char*, int); - /* 80152B68 */ void getTexPtrnAnmP(char*, int); - /* 80152BA4 */ void getTexSRTKeyAnmP(char*, int); - /* 80152C1C */ void setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int); - /* 80152C80 */ void setBckAnm(J3DAnmTransform*, f32, int, int, int, bool); - /* 80152CC4 */ void setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int); - /* 80152D04 */ void setBtkAnm(J3DAnmTextureSRTKey*, J3DModelData*, f32, int); - /* 80152D84 */ void setEnvTevColor(); - /* 80152DE0 */ void setRoomNo(); - /* 80153150 */ void playExpressionAnm(daNpcF_c::daNpcF_anmPlayData***); - /* 80153264 */ void playMotionAnm(daNpcF_c::daNpcF_anmPlayData***); - /* 8015337C */ void setLookatMtx(int, int*, f32); - /* 80153718 */ void ctrlMsgAnm(int&, int&, fopAc_ac_c*, int); - /* 80153D1C */ void initTalk(int, fopAc_ac_c**); - /* 80153D84 */ void talkProc(int*, int, fopAc_ac_c**); - /* 80154250 */ void setAngle(s16); - /* 80D1203C */ ~daNpcF_c(); - /* 80D122D0 */ daNpcF_c(); - /* 80D12680 */ void adjustShapeAngle(); - /* 80D12684 */ void setCollisions(); - - static u8 mCcDCyl[68]; -}; - -struct daNpcF_MatAnm_c { - /* 80150738 */ void initialize(); -}; - -struct daNpcF_Lookat_c { - /* 80151038 */ void initialize(); - /* 801510B8 */ void setParam(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, s16, - cXyz*); - /* 80151350 */ void calc(fopAc_ac_c*, f32 (*)[4], csXyz**, int, int, int); - /* 80D11EEC */ ~daNpcF_Lookat_c(); -}; - -struct daNpcF_ActorMngr_c { - /* 801506B0 */ void initialize(); - /* 80D12288 */ ~daNpcF_ActorMngr_c(); - /* 80D124C0 */ daNpcF_ActorMngr_c(); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dMsgFlow_c { - /* 80249F00 */ dMsgFlow_c(); - /* 80249F48 */ ~dMsgFlow_c(); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); - /* 80042518 */ void reset(void*); -}; - -struct dEvent_manager_c { - /* 80046800 */ void setObjectArchive(char*); - /* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8); - /* 80047A78 */ void endCheck(s16); - /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int); - /* 80047D4C */ void getIsAddvance(int); - /* 80047F5C */ void getMyNowCutName(int); - /* 8004817C */ void cutEnd(int); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80D1256C */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct dCamera_c { - /* 80088A7C */ void StartEventCamera(int, int, ...); - /* 80088BBC */ void EndEventCamera(int); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80D125C8 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80D124FC */ ~dBgS_AcchCir(); -}; - -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80D0F3F0 */ ~cM3dGCyl(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 80D0F438 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_ObjCo { - /* 80264900 */ void SetIGrp(u32); - /* 8026491C */ void SetVsGrp(u32); -}; - -struct cCcD_GStts { - /* 80D12688 */ ~cCcD_GStts(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct cBgS_GndChk { - /* 80267C1C */ cBgS_GndChk(); - /* 80267C94 */ ~cBgS_GndChk(); -}; - -struct Z2SeqMgr { - /* 802AF49C */ void subBgmStart(u32); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - template - struct TSinCosTable {}; - /* TSinCosTable<13, f32> */ - struct TSinCosTable__template0 { - /* 80D11EA0 */ void func_80D11EA0(void* _this, s16) /* const */; - }; - - static u8 sincosTable_[65536]; -}; - -struct J3DTexNoAnm { - /* 80D0FC20 */ ~J3DTexNoAnm(); - /* 80D0FC68 */ J3DTexNoAnm(); - /* 80D11640 */ void calc(u16*) const; -}; - -struct J3DTexMtxAnm { - /* 80D0FC8C */ ~J3DTexMtxAnm(); - /* 80D0FCC8 */ J3DTexMtxAnm(); -}; - -struct J3DTevKColorAnm { - /* 80D0FB78 */ ~J3DTevKColorAnm(); - /* 80D0FBB4 */ J3DTevKColorAnm(); -}; - -struct J3DTevColorAnm { - /* 80D0FBCC */ ~J3DTevColorAnm(); - /* 80D0FC08 */ J3DTevColorAnm(); -}; - -struct J3DSys { - static u8 mCurrentMtx[48]; -}; - -struct J3DMaterialAnm { - /* 8032C320 */ void initialize(); -}; - -struct J3DMatColorAnm { - /* 80D0FCE0 */ ~J3DMatColorAnm(); - /* 80D0FD1C */ J3DMatColorAnm(); -}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80D12638 */ ~J3DFrameCtrl(); -}; +#include "d/d_camera.h" // // Forward References: @@ -529,9 +189,6 @@ extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); extern "C" void getTexNo__16J3DAnmTexPatternCFUsPUs(); extern "C" void initialize__14J3DMaterialAnmFv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECSquareMag(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void __ptmf_test(); @@ -546,8 +203,6 @@ extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" u8 mCcDCyl__8daNpcF_c[68]; @@ -559,10 +214,8 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" extern void* __vt__14J3DMaterialAnm[4]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -702,25 +355,30 @@ SECTION_DATA static void* lit_4910[3] = { #pragma pop /* 80D129BC-80D129DC -00001 0020+00 1/0 0/0 0/0 .data daObjTks_MethodTable */ -SECTION_DATA static void* daObjTks_MethodTable[8] = { - (void*)daObjTks_Create__FPv, - (void*)daObjTks_Delete__FPv, - (void*)daObjTks_Execute__FPv, - (void*)daObjTks_IsDelete__FPv, - (void*)daObjTks_Draw__FPv, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjTks_MethodTable = { + (process_method_func)daObjTks_Create__FPv, + (process_method_func)daObjTks_Delete__FPv, + (process_method_func)daObjTks_Execute__FPv, + (process_method_func)daObjTks_IsDelete__FPv, + (process_method_func)daObjTks_Draw__FPv, }; /* 80D129DC-80D12A0C -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_TKS */ -SECTION_DATA extern void* g_profile_OBJ_TKS[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02770000, (void*)&g_fpcLf_Method, - (void*)0x00000DE4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01780000, (void*)&daObjTks_MethodTable, - (void*)0x08044008, (void*)0x040E0000, +extern actor_process_profile_definition g_profile_OBJ_TKS = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_TKS, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjTks_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 376, // mPriority + &daObjTks_MethodTable, // sub_method + 0x08044008, // mStatus + fopAc_NPC_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D12A0C-80D12A18 00011C 000C+00 2/2 0/0 0/0 .data __vt__11J3DTexNoAnm */ @@ -835,7 +493,8 @@ asm daObjTks_c::daObjTks_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks/__dt__8cM3dGCylFv.s" } @@ -845,7 +504,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks/__dt__8cM3dGAabFv.s" } @@ -954,7 +614,8 @@ asm void daObjTks_c::CreateHeap() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTevKColorAnm::~J3DTevKColorAnm() { +// asm J3DTevKColorAnm::~J3DTevKColorAnm() { +extern "C" asm void __dt__15J3DTevKColorAnmFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks/__dt__15J3DTevKColorAnmFv.s" } @@ -964,7 +625,8 @@ asm J3DTevKColorAnm::~J3DTevKColorAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTevKColorAnm::J3DTevKColorAnm() { +// asm J3DTevKColorAnm::J3DTevKColorAnm() { +extern "C" asm void __ct__15J3DTevKColorAnmFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks/__ct__15J3DTevKColorAnmFv.s" } @@ -974,7 +636,8 @@ asm J3DTevKColorAnm::J3DTevKColorAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTevColorAnm::~J3DTevColorAnm() { +// asm J3DTevColorAnm::~J3DTevColorAnm() { +extern "C" asm void __dt__14J3DTevColorAnmFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks/__dt__14J3DTevColorAnmFv.s" } @@ -984,7 +647,8 @@ asm J3DTevColorAnm::~J3DTevColorAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTevColorAnm::J3DTevColorAnm() { +// asm J3DTevColorAnm::J3DTevColorAnm() { +extern "C" asm void __ct__14J3DTevColorAnmFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks/__ct__14J3DTevColorAnmFv.s" } @@ -994,7 +658,8 @@ asm J3DTevColorAnm::J3DTevColorAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTexNoAnm::~J3DTexNoAnm() { +// asm J3DTexNoAnm::~J3DTexNoAnm() { +extern "C" asm void __dt__11J3DTexNoAnmFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks/__dt__11J3DTexNoAnmFv.s" } @@ -1004,7 +669,8 @@ asm J3DTexNoAnm::~J3DTexNoAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTexNoAnm::J3DTexNoAnm() { +// asm J3DTexNoAnm::J3DTexNoAnm() { +extern "C" asm void __ct__11J3DTexNoAnmFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks/__ct__11J3DTexNoAnmFv.s" } @@ -1014,7 +680,8 @@ asm J3DTexNoAnm::J3DTexNoAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTexMtxAnm::~J3DTexMtxAnm() { +// asm J3DTexMtxAnm::~J3DTexMtxAnm() { +extern "C" asm void __dt__12J3DTexMtxAnmFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks/__dt__12J3DTexMtxAnmFv.s" } @@ -1024,7 +691,8 @@ asm J3DTexMtxAnm::~J3DTexMtxAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTexMtxAnm::J3DTexMtxAnm() { +// asm J3DTexMtxAnm::J3DTexMtxAnm() { +extern "C" asm void __ct__12J3DTexMtxAnmFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks/__ct__12J3DTexMtxAnmFv.s" } @@ -1034,7 +702,8 @@ asm J3DTexMtxAnm::J3DTexMtxAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DMatColorAnm::~J3DMatColorAnm() { +// asm J3DMatColorAnm::~J3DMatColorAnm() { +extern "C" asm void __dt__14J3DMatColorAnmFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks/__dt__14J3DMatColorAnmFv.s" } @@ -1044,7 +713,8 @@ asm J3DMatColorAnm::~J3DMatColorAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DMatColorAnm::J3DMatColorAnm() { +// asm J3DMatColorAnm::J3DMatColorAnm() { +extern "C" asm void __ct__14J3DMatColorAnmFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks/__ct__14J3DMatColorAnmFv.s" } @@ -1533,7 +1203,8 @@ static bool daObjTks_IsDelete(void* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTexNoAnm::calc(u16* param_0) const { +// asm void J3DTexNoAnm::calc(u16* param_0) const { +extern "C" asm void calc__11J3DTexNoAnmCFPUs() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks/calc__11J3DTexNoAnmCFPUs.s" } @@ -1692,7 +1363,8 @@ REGISTER_CTORS(0x80D11EAC, __sinit_d_a_obj_tks_cpp); #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daNpcF_Lookat_c::~daNpcF_Lookat_c() { +// asm daNpcF_Lookat_c::~daNpcF_Lookat_c() { +extern "C" asm void __dt__15daNpcF_Lookat_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks/__dt__15daNpcF_Lookat_cFv.s" } @@ -1702,14 +1374,16 @@ asm daNpcF_Lookat_c::~daNpcF_Lookat_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm csXyz::~csXyz() { +// asm csXyz::~csXyz() { +extern "C" asm void __dt__5csXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks/__dt__5csXyzFv.s" } #pragma pop /* 80D11FF8-80D11FFC 002E58 0004+00 2/2 0/0 0/0 .text __ct__5csXyzFv */ -csXyz::csXyz() { +// csXyz::csXyz() { +extern "C" asm void __ct__5csXyzFv() { /* empty function */ } @@ -1717,14 +1391,16 @@ csXyz::csXyz() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks/__dt__4cXyzFv.s" } #pragma pop /* 80D12038-80D1203C 002E98 0004+00 2/2 0/0 0/0 .text __ct__4cXyzFv */ -cXyz::cXyz() { +// cXyz::cXyz() { +extern "C" asm void __ct__4cXyzFv() { /* empty function */ } @@ -1732,7 +1408,8 @@ cXyz::cXyz() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daNpcF_c::~daNpcF_c() { +// asm daNpcF_c::~daNpcF_c() { +extern "C" asm void __dt__8daNpcF_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks/__dt__8daNpcF_cFv.s" } @@ -1742,7 +1419,8 @@ asm daNpcF_c::~daNpcF_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daNpcF_ActorMngr_c::~daNpcF_ActorMngr_c() { +// asm daNpcF_ActorMngr_c::~daNpcF_ActorMngr_c() { +extern "C" asm void __dt__18daNpcF_ActorMngr_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks/__dt__18daNpcF_ActorMngr_cFv.s" } @@ -1752,7 +1430,8 @@ asm daNpcF_ActorMngr_c::~daNpcF_ActorMngr_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daNpcF_c::daNpcF_c() { +// asm daNpcF_c::daNpcF_c() { +extern "C" asm void __ct__8daNpcF_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks/__ct__8daNpcF_cFv.s" } @@ -1762,7 +1441,8 @@ asm daNpcF_c::daNpcF_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daNpcF_ActorMngr_c::daNpcF_ActorMngr_c() { +// asm daNpcF_ActorMngr_c::daNpcF_ActorMngr_c() { +extern "C" asm void __ct__18daNpcF_ActorMngr_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks/__ct__18daNpcF_ActorMngr_cFv.s" } @@ -1772,7 +1452,8 @@ asm daNpcF_ActorMngr_c::daNpcF_ActorMngr_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks/__dt__12dBgS_AcchCirFv.s" } @@ -1782,7 +1463,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks/__dt__10dCcD_GSttsFv.s" } @@ -1792,7 +1474,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks/__dt__12dBgS_ObjAcchFv.s" } @@ -1802,19 +1485,22 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks/__dt__12J3DFrameCtrlFv.s" } #pragma pop /* 80D12680-80D12684 0034E0 0004+00 1/0 0/0 0/0 .text adjustShapeAngle__8daNpcF_cFv */ -void daNpcF_c::adjustShapeAngle() { +// void daNpcF_c::adjustShapeAngle() { +extern "C" asm void adjustShapeAngle__8daNpcF_cFv() { /* empty function */ } /* 80D12684-80D12688 0034E4 0004+00 1/0 0/0 0/0 .text setCollisions__8daNpcF_cFv */ -void daNpcF_c::setCollisions() { +// void daNpcF_c::setCollisions() { +extern "C" asm void setCollisions__8daNpcF_cFv() { /* empty function */ } @@ -1822,7 +1508,8 @@ void daNpcF_c::setCollisions() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_toaru_maki/d_a_obj_toaru_maki.cpp b/rel/d/a/obj/d_a_obj_toaru_maki/d_a_obj_toaru_maki.cpp index 84448d981f8..556177bda78 100644 --- a/rel/d/a/obj/d_a_obj_toaru_maki/d_a_obj_toaru_maki.cpp +++ b/rel/d/a/obj/d_a_obj_toaru_maki/d_a_obj_toaru_maki.cpp @@ -6,23 +6,6 @@ #include "rel/d/a/obj/d_a_obj_toaru_maki/d_a_obj_toaru_maki.h" #include "dol2asm.h" -class daObjToaruMaki_c : public fopAc_ac_c, public request_of_phase_process_class { -public: - /* 80D13098 */ daObjToaruMaki_c(); - /* 80D130E0 */ virtual ~daObjToaruMaki_c(); - /* 80D1316C */ int createHeap(); - /* 80D132B4 */ int create(); - /* 80D133C0 */ int Delete(); - /* 80D1343C */ void setModelMtx(); - /* 80D134A0 */ int draw(); - /* 80D13524 */ int execute(); - - u32 getNameArg_0() { return fopAcM_GetParamBit(this, 0, 4); } - - /* 0x574 */ J3DModel* mpModel; - /* 0x578 */ s32 field_0x578; - /* 0x57C */ Mtx mMtx; -}; // Size: 0x5AC // // Forward References: @@ -91,25 +74,30 @@ static asm int daObjToaruMaki_c_createHeap(fopAc_ac_c* i_this) { static char* l_arcName[2] = {"T_Maki1", "T_Maki2"}; /* 80D1362C-80D1364C -00001 0020+00 1/0 0/0 0/0 .data daObjToaruMaki_METHODS */ -SECTION_DATA static void* daObjToaruMaki_METHODS[8] = { - (void*)daObjToaruMaki_create__FP16daObjToaruMaki_c, - (void*)daObjToaruMaki_Delete__FP16daObjToaruMaki_c, - (void*)daObjToaruMaki_execute__FP16daObjToaruMaki_c, - (void*)NULL, - (void*)daObjToaruMaki_draw__FP16daObjToaruMaki_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjToaruMaki_METHODS = { + (process_method_func)daObjToaruMaki_create__FP16daObjToaruMaki_c, + (process_method_func)daObjToaruMaki_Delete__FP16daObjToaruMaki_c, + (process_method_func)daObjToaruMaki_execute__FP16daObjToaruMaki_c, + 0, + (process_method_func)daObjToaruMaki_draw__FP16daObjToaruMaki_c, }; /* 80D1364C-80D1367C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_ToaruMaki */ -SECTION_DATA extern void* g_profile_Obj_ToaruMaki[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01A90000, (void*)&g_fpcLf_Method, - (void*)0x000005AC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02ED0000, (void*)&daObjToaruMaki_METHODS, - (void*)0x00040000, (void*)0x030E0000, +extern actor_process_profile_definition g_profile_Obj_ToaruMaki = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_ToaruMaki, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjToaruMaki_c),// mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 749, // mPriority + &daObjToaruMaki_METHODS, // sub_method + 0x00040000, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D1367C-80D13688 000058 000C+00 2/2 0/0 0/0 .data __vt__16daObjToaruMaki_c */ diff --git a/rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.cpp b/rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.cpp index acf67648a88..c8e670a4fdc 100644 --- a/rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.cpp +++ b/rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.cpp @@ -1,147 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_toby -// +/** + * @file d_a_obj_toby.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.h" #include "dol2asm.h" - -// -// Types: -// - -struct yuka_s { - /* 80D154F4 */ ~yuka_s(); - /* 80D15530 */ yuka_s(); -}; - -struct request_of_phase_process_class {}; - -struct obj_toby_class {}; - -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daPy_py_c { - /* 8015F89C */ void checkBoomerangCharge(); - /* 80D155B8 */ void getLeftHandPos() const; -}; - -struct daObj_Toby_HIO_c { - /* 80D1378C */ daObj_Toby_HIO_c(); - /* 80D15534 */ ~daObj_Toby_HIO_c(); -}; - -struct daE_HZ_c { - /* 806EB0FC */ void isWait(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); -}; - -struct dKy_tevstr_c {}; - -struct Vec {}; - -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; - /* 80266B34 */ void operator-(Vec const&) const; - /* 80D139FC */ ~cXyz(); -}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct JPAEmitterManager {}; - -struct dPa_simpleEcallBack { - /* 8004AF98 */ void create(JPAEmitterManager*, u16, u8); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz { - /* 8026745C */ void operator+=(csXyz&); -}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct J3DModel {}; - -struct J3DModelData {}; - -struct dComIfG_play_c { - /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); - /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); - /* 8002CB68 */ void entrySimpleModel(J3DModel*, int); -}; - -struct dCamera_c { - /* 801614AC */ void Start(); - /* 801614D0 */ void Stop(); - /* 8016300C */ void SetTrimSize(s32); - /* 80180AE0 */ void Set(cXyz, cXyz, f32, s16); - /* 80180C18 */ void Reset(cXyz, cXyz); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; +#include "d/d_camera.h" // // Forward References: @@ -223,11 +87,6 @@ extern "C" void MtxPosition__FP4cXyzP4cXyz(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSVECAdd(); -extern "C" void PSVECSubtract(); -extern "C" void PSVECSquareMag(); extern "C" void __construct_array(); extern "C" void _savegpr_21(); extern "C" void _savegpr_23(); @@ -241,14 +100,8 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); -extern "C" void strcmp(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void isWait__8daE_HZ_cFv(); extern "C" void __register_global_object(); @@ -295,25 +148,30 @@ SECTION_DATA static u8 r11yuka_image[192] = { }; /* 80D15854-80D15874 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Toby_Method */ -SECTION_DATA static void* l_daObj_Toby_Method[8] = { - (void*)daObj_Toby_Create__FP10fopAc_ac_c, - (void*)daObj_Toby_Delete__FP14obj_toby_class, - (void*)daObj_Toby_Execute__FP14obj_toby_class, - (void*)daObj_Toby_IsDelete__FP14obj_toby_class, - (void*)daObj_Toby_Draw__FP14obj_toby_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObj_Toby_Method = { + (process_method_func)daObj_Toby_Create__FP10fopAc_ac_c, + (process_method_func)daObj_Toby_Delete__FP14obj_toby_class, + (process_method_func)daObj_Toby_Execute__FP14obj_toby_class, + (process_method_func)daObj_Toby_IsDelete__FP14obj_toby_class, + (process_method_func)daObj_Toby_Draw__FP14obj_toby_class, }; /* 80D15874-80D158A4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_TOBY */ -SECTION_DATA extern void* g_profile_OBJ_TOBY[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x002F0000, (void*)&g_fpcLf_Method, - (void*)0x00006374, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x003A0000, (void*)&l_daObj_Toby_Method, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_TOBY = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_TOBY, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(obj_toby_class), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 58, // mPriority + &l_daObj_Toby_Method, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D158A4-80D158B0 0001D0 000C+00 2/2 0/0 0/0 .data __vt__16daObj_Toby_HIO_c */ @@ -405,7 +263,8 @@ static asm void s_bomb_sub(void* param_0, void* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_toby/d_a_obj_toby/__dt__4cXyzFv.s" } @@ -998,7 +857,8 @@ REGISTER_CTORS(0x80D1557C, __sinit_d_a_obj_toby_cpp); #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::getLeftHandPos() const { +// asm void daPy_py_c::getLeftHandPos() const { +extern "C" asm void getLeftHandPos__9daPy_py_cCFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_toby/d_a_obj_toby/getLeftHandPos__9daPy_py_cCFv.s" } diff --git a/rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse.cpp b/rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse.cpp index b770fe83de8..467a755dbdb 100644 --- a/rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse.cpp +++ b/rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse.cpp @@ -1,191 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_tobyhouse -// +/** + * @file d_a_obj_tobyhouse.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - -struct mDoMtx_stack_c { - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c {}; - -struct cXyz { - /* 80D17700 */ ~cXyz(); -}; - -struct fopAcM_wt_c { - /* 8001DD84 */ void waterCheck(cXyz const*); - - static f32 mWaterY[1 + 1 /* padding */]; -}; - -struct daObjTobyHouse_c { - /* 80D15F0C */ void initBaseMtx(); - /* 80D15F48 */ void setBaseMtx(); - /* 80D15FE0 */ void Create(); - /* 80D161A4 */ void CreateHeap(); - /* 80D163F0 */ void create1st(); - /* 80D164C0 */ void Execute(f32 (**)[3][4]); - /* 80D16560 */ void action(); - /* 80D1661C */ void actionWait(); - /* 80D166E0 */ void actionOrderEvent(); - /* 80D167BC */ void actionEvent(); - /* 80D16860 */ void actionDead(); - /* 80D16864 */ void demoProc(); - /* 80D171C0 */ void sceneChange(); - /* 80D17230 */ void Draw(); - /* 80D17374 */ void checkLODModel(); - /* 80D174F8 */ void Delete(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); - /* 8006FB10 */ void StartQuake(int, int, cXyz); - /* 8006FD94 */ void StopQuake(int); -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 8003498C */ void onEventBit(u16); -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); - /* 80042914 */ void setSkipProc(void*, int (*)(void*, int), int); -}; - -struct dEvent_manager_c { - /* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8); - /* 80047A78 */ void endCheck(s16); - /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int); - /* 80047D4C */ void getIsAddvance(int); - /* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int); - /* 800480EC */ void getMySubstanceP(int, char const*, int); - /* 8004817C */ void cutEnd(int); -}; - -struct dComIfG_play_c { - /* 8002C97C */ void getLayerNo(int); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct camera_class {}; - -struct Z2SeqMgr { - /* 802AFB94 */ void bgmStreamPrepare(u32); - /* 802AFE18 */ void bgmStreamPlay(); - /* 802AFEDC */ void bgmStreamStop(u32); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JUTNameTab { - /* 802DEAF8 */ void getName(u16) const; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct JGeometry { - template - struct TVec3 {}; - /* TVec3 */ - struct TVec3__template0 {}; -}; -struct J3DSys { - static u8 mCurrentMtx[48]; -}; - -struct J3DModel {}; - -struct J3DJoint {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80D163A8 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -289,10 +110,6 @@ extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void getName__10JUTNameTabCFUs(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXConcat(); -extern "C" void PSMTXTrans(); -extern "C" void PSVECSquareDistance(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_22(); extern "C" void _savegpr_23(); @@ -302,17 +119,11 @@ extern "C" void _restgpr_22(); extern "C" void _restgpr_23(); extern "C" void _restgpr_26(); extern "C" void _restgpr_29(); -extern "C" void strcmp(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -611,25 +422,30 @@ SECTION_DATA static void* lit_4774[7] = { }; /* 80D17930-80D17950 -00001 0020+00 1/0 0/0 0/0 .data daObjTobyHouse_METHODS */ -SECTION_DATA static void* daObjTobyHouse_METHODS[8] = { - (void*)daObjTobyHouse_create1st__FP16daObjTobyHouse_c, - (void*)daObjTobyHouse_MoveBGDelete__FP16daObjTobyHouse_c, - (void*)daObjTobyHouse_MoveBGExecute__FP16daObjTobyHouse_c, - (void*)NULL, - (void*)daObjTobyHouse_MoveBGDraw__FP16daObjTobyHouse_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjTobyHouse_METHODS = { + (process_method_func)daObjTobyHouse_create1st__FP16daObjTobyHouse_c, + (process_method_func)daObjTobyHouse_MoveBGDelete__FP16daObjTobyHouse_c, + (process_method_func)daObjTobyHouse_MoveBGExecute__FP16daObjTobyHouse_c, + 0, + (process_method_func)daObjTobyHouse_MoveBGDraw__FP16daObjTobyHouse_c, }; /* 80D17950-80D17980 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_TobyHouse */ -SECTION_DATA extern void* g_profile_Obj_TobyHouse[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00A70000, (void*)&g_fpcLf_Method, - (void*)0x00000600, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02220000, (void*)&daObjTobyHouse_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_TobyHouse = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_TobyHouse, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjTobyHouse_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 546, // mPriority + &daObjTobyHouse_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D17980-80D1798C 000128 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ @@ -653,7 +469,8 @@ asm void daObjTobyHouse_c::CreateHeap() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse/__dt__12J3DFrameCtrlFv.s" } @@ -1019,7 +836,8 @@ extern "C" asm void func_80D176E4(void* _this, u8* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse/__dt__4cXyzFv.s" } diff --git a/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap.cpp b/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap.cpp index ccdd8e072d0..98a0b2bb37a 100644 --- a/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap.cpp +++ b/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap.cpp @@ -1,186 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_togeTrap -// +/** + * @file d_a_obj_togeTrap.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80D17C2C */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct fOpAcm_HIO_entry_c { - /* 80D17BD0 */ ~fOpAcm_HIO_entry_c(); -}; - -struct dBgW {}; - -struct daTogeTrap_c { - /* 80D17C74 */ void setBaseMtx(); - /* 80D17D5C */ void CreateHeap(); - /* 80D17E14 */ void create(); - /* 80D18244 */ void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*); - /* 80D1825C */ void Execute(f32 (**)[3][4]); - /* 80D182C8 */ void moveMain(); - /* 80D185DC */ void playerAreaCheck(); - /* 80D186B0 */ void init_modeWait(); - /* 80D186BC */ void modeWait(); - /* 80D186C0 */ void init_modeMoveUp(); - /* 80D18784 */ void modeMoveUp(); - /* 80D188C0 */ void init_modeMoveDown(); - /* 80D188DC */ void modeMoveDown(); - /* 80D18994 */ void init_modeBreak(); - /* 80D18A5C */ void modeBreak(); - /* 80D18BEC */ void Draw(); - /* 80D18CA4 */ void Delete(); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; -}; - -struct daTogeTrap_HIO_c { - /* 80D17B6C */ daTogeTrap_HIO_c(); - /* 80D18DA8 */ ~daTogeTrap_HIO_c(); -}; - -struct daPy_py_c { - /* 8015F7C8 */ void getSpinnerRideSpeed() const; - /* 8015F814 */ void checkSpinnerReflectEffect(); -}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80D181E8 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 80084548 */ void GetTgHitGObj(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); - /* 80D18008 */ ~dCcD_Cyl(); - /* 80D180D4 */ dCcD_Cyl(); -}; - -struct dBgW_Base {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80D18158 */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80D181A0 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80D18D60 */ ~cCcD_GStts(); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -274,18 +100,12 @@ extern "C" void cLib_addCalc__FPfffff(); extern "C" void cLib_chaseF__FPfff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); extern "C" void __construct_array(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_22(); extern "C" void _savegpr_25(); extern "C" void _restgpr_22(); extern "C" void _restgpr_25(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -293,8 +113,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -418,25 +236,30 @@ SECTION_DATA static u8 mode_proc[48] = { #pragma pop /* 80D18FD4-80D18FF4 -00001 0020+00 1/0 0/0 0/0 .data l_daTogeTrap_Method */ -SECTION_DATA static void* l_daTogeTrap_Method[8] = { - (void*)daTogeTrap_Create__FP10fopAc_ac_c, - (void*)daTogeTrap_Delete__FP12daTogeTrap_c, - (void*)daTogeTrap_Execute__FP12daTogeTrap_c, - (void*)NULL, - (void*)daTogeTrap_Draw__FP12daTogeTrap_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daTogeTrap_Method = { + (process_method_func)daTogeTrap_Create__FP10fopAc_ac_c, + (process_method_func)daTogeTrap_Delete__FP12daTogeTrap_c, + (process_method_func)daTogeTrap_Execute__FP12daTogeTrap_c, + 0, + (process_method_func)daTogeTrap_Draw__FP12daTogeTrap_c, }; /* 80D18FF4-80D19024 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_TogeTrap */ -SECTION_DATA extern void* g_profile_Obj_TogeTrap[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x004A0000, (void*)&g_fpcLf_Method, - (void*)0x00000AE4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x020C0000, (void*)&l_daTogeTrap_Method, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_TogeTrap = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_TogeTrap, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daTogeTrap_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 524, // mPriority + &l_daTogeTrap_Method, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D19024-80D19030 000114 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -516,7 +339,8 @@ asm daTogeTrap_HIO_c::daTogeTrap_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { +// asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { +extern "C" asm void __dt__18fOpAcm_HIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap/__dt__18fOpAcm_HIO_entry_cFv.s" } @@ -526,7 +350,8 @@ asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap/__dt__14mDoHIO_entry_cFv.s" } @@ -586,7 +411,8 @@ asm void daTogeTrap_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Cyl::~dCcD_Cyl() { +// asm dCcD_Cyl::~dCcD_Cyl() { +extern "C" asm void __dt__8dCcD_CylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap/__dt__8dCcD_CylFv.s" } @@ -596,7 +422,8 @@ asm dCcD_Cyl::~dCcD_Cyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Cyl::dCcD_Cyl() { +// asm dCcD_Cyl::dCcD_Cyl() { +extern "C" asm void __ct__8dCcD_CylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap/__ct__8dCcD_CylFv.s" } @@ -606,7 +433,8 @@ asm dCcD_Cyl::dCcD_Cyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap/__dt__8cM3dGCylFv.s" } @@ -616,7 +444,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap/__dt__8cM3dGAabFv.s" } @@ -626,7 +455,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap/__dt__10dCcD_GSttsFv.s" } @@ -888,7 +718,8 @@ static asm void daTogeTrap_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.cpp b/rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.cpp index 57e56981d92..8da84ab5f61 100644 --- a/rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.cpp +++ b/rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.cpp @@ -1,230 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_tombo -// +/** + * @file d_a_obj_tombo.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; - -struct mDoExt_McaMorfSO { - /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, - int, Z2Creature*, u32, u32); - /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32); - /* 800110B0 */ void play(u32, s8); - /* 800111C0 */ void entryDL(); - /* 800111EC */ void modelCalc(); - /* 80011310 */ void stopZelAnime(); -}; - -struct fopAc_ac_c {}; - -struct daPy_boomerangMove_c { - /* 8015E5B0 */ void initOffset(cXyz const*); - /* 8015E654 */ void posMove(cXyz*, s16*, fopAc_ac_c*, s16); - /* 8015E87C */ void bgCheckAfterOffset(cXyz const*); -}; - -struct daObj_TomHIO_c { - /* 80D191CC */ daObj_TomHIO_c(); - /* 80D1B618 */ ~daObj_TomHIO_c(); -}; - -struct daObjTOMBO_c { - /* 80D19200 */ void InitCcSph(); - /* 80D1926C */ void SetCcSph(); - /* 80D192E4 */ void CreateHeap(); - /* 80D19658 */ void WaitAction(); - /* 80D19744 */ void SpeedSet(); - /* 80D19834 */ void CheckWater(); - /* 80D199F4 */ void CheckGround(); - /* 80D19B48 */ void CheckWall(); - /* 80D19C34 */ void SearchLink(); - /* 80D19E48 */ void LinkAction(); - /* 80D1A138 */ void MoveAction(); - /* 80D1A280 */ void Action(); - /* 80D1A3EC */ void ShopAction(); - /* 80D1A514 */ void Insect_Release(); - /* 80D1A524 */ void ParticleSet(); - /* 80D1A648 */ void BoomChk(); - /* 80D1A904 */ void Execute(); - /* 80D1AB20 */ void ObjHit(); - /* 80D1AC84 */ void Z_BufferChk(); - /* 80D1AE00 */ void Delete(); - /* 80D1AE68 */ void setBaseMtx(); - /* 80D1AFC8 */ void CreateChk(); - /* 80D1B174 */ void create(); -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dMenu_Insect_c { - /* 801D9F3C */ void isCatchNotGiveInsect(u8); -}; - -struct dInsect_c { - /* 8015E010 */ dInsect_c(); - /* 8015E078 */ void Insect_GetDemoMain(); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dDlst_peekZ_c { - /* 80056018 */ void newData(s16, s16, u32*); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjGndChk_All { - /* 800778E8 */ ~dBgS_ObjGndChk_All(); -}; - -struct dBgS_ObjGndChk { - /* 80D1997C */ ~dBgS_ObjGndChk(); -}; - -struct dBgS_ObjAcch { - /* 80D1B510 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); -}; - -struct cBgS_PolyInfo {}; - -struct dBgS { - /* 80074E50 */ void GetPolyAtt0(cBgS_PolyInfo const&); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_LinChk {}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 800744A0 */ void GroundCross(cBgS_GndChk*); - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct _GXTexObj {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80D195CC */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -361,14 +144,10 @@ extern "C" void init__10Z2CreatureFP3VecP3VecUcUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" extern void* __vt__18dBgS_ObjGndChk_All[12]; extern "C" extern void* __vt__8dCcD_Sph[36]; @@ -379,7 +158,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" void __register_global_object(); @@ -397,25 +175,30 @@ SECTION_RODATA static f32 const lit_3776 = 1.0f; COMPILER_STRIP_GATE(0x80D1B6DC, &lit_3776); /* 80D1B7F8-80D1B818 -00001 0020+00 1/0 0/0 0/0 .data l_daObjTOMBO_Method */ -SECTION_DATA static void* l_daObjTOMBO_Method[8] = { - (void*)daObjTOMBO_Create__FP10fopAc_ac_c, - (void*)daObjTOMBO_Delete__FP12daObjTOMBO_c, - (void*)daObjTOMBO_Execute__FP12daObjTOMBO_c, - (void*)daObjTOMBO_IsDelete__FP12daObjTOMBO_c, - (void*)daObjTOMBO_Draw__FP12daObjTOMBO_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjTOMBO_Method = { + (process_method_func)daObjTOMBO_Create__FP10fopAc_ac_c, + (process_method_func)daObjTOMBO_Delete__FP12daObjTOMBO_c, + (process_method_func)daObjTOMBO_Execute__FP12daObjTOMBO_c, + (process_method_func)daObjTOMBO_IsDelete__FP12daObjTOMBO_c, + (process_method_func)daObjTOMBO_Draw__FP12daObjTOMBO_c, }; /* 80D1B818-80D1B848 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Tombo */ -SECTION_DATA extern void* g_profile_Obj_Tombo[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x014A0000, (void*)&g_fpcLf_Method, - (void*)0x00000A18, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01E70000, (void*)&l_daObjTOMBO_Method, - (void*)0x000C0100, (void*)0x030E0000, +extern actor_process_profile_definition g_profile_Obj_Tombo = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Tombo, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjTOMBO_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 487, // mPriority + &l_daObjTOMBO_Method, // sub_method + 0x000C0100, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D1B848-80D1B86C 000050 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ @@ -577,7 +360,8 @@ asm void daObjTOMBO_c::CreateHeap() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo/__dt__12J3DFrameCtrlFv.s" } @@ -693,7 +477,8 @@ asm void daObjTOMBO_c::CheckWater() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +// asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +extern "C" asm void __dt__14dBgS_ObjGndChkFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo/__dt__14dBgS_ObjGndChkFv.s" } @@ -1175,7 +960,8 @@ asm void daObjTOMBO_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.cpp b/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.cpp index 3960a94781d..84e25ff8107 100644 --- a/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.cpp +++ b/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.cpp @@ -378,25 +378,30 @@ asm int daObjTrnd_c::Create() { /* ############################################################################################## */ /* 80D1C400-80D1C420 -00001 0020+00 1/0 0/0 0/0 .data l_daObjTrnd_Method */ -SECTION_DATA static void* l_daObjTrnd_Method[8] = { - (void*)daObjTrnd_Create__FP11daObjTrnd_c, - (void*)daObjTrnd_Delete__FP11daObjTrnd_c, - (void*)daObjTrnd_Execute__FP11daObjTrnd_c, - (void*)NULL, - (void*)daObjTrnd_Draw__FP11daObjTrnd_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjTrnd_Method = { + (process_method_func)daObjTrnd_Create__FP11daObjTrnd_c, + (process_method_func)daObjTrnd_Delete__FP11daObjTrnd_c, + (process_method_func)daObjTrnd_Execute__FP11daObjTrnd_c, + 0, + (process_method_func)daObjTrnd_Draw__FP11daObjTrnd_c, }; /* 80D1C420-80D1C450 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Tornado */ -SECTION_DATA extern void* g_profile_Obj_Tornado[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x015B0000, (void*)&g_fpcLf_Method, - (void*)0x00000770, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01BC0000, (void*)&l_daObjTrnd_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Tornado = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Tornado, // mProcName + &g_fpcLf_Method.mBase, // sub_method + 0x00000770, // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 444, // mPriority + &l_daObjTrnd_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D1C450-80D1C45C 00009C 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGAab */ diff --git a/rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.cpp b/rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.cpp index 085ab3727b3..a6491646c93 100644 --- a/rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.cpp +++ b/rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.cpp @@ -1,144 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_tp -// +/** + * @file d_a_obj_tp.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_tp_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DAnmTransform {}; - -struct J3DModelData { - /* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]); -}; - -struct mDoExt_McaMorf { - /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, - int, void*, u32, u32); - /* 8001037C */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32, void*); - /* 800105C8 */ void play(Vec*, u32, s8); - /* 80010680 */ void entryDL(); - /* 800106AC */ void modelCalc(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS_PolyInfo {}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct J3DTexMtxInfo { - /* 80325794 */ void setEffectMtx(f32 (*)[4]); -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 8032842C */ void checkPass(f32); - /* 80D1E908 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -225,9 +93,6 @@ extern "C" void setEffectMtx__13J3DTexMtxInfoFPA4_f(); extern "C" void simpleCalcMaterial__12J3DModelDataFUsPA4_f(); extern "C" void init__12J3DFrameCtrlFs(); extern "C" void checkPass__12J3DFrameCtrlFf(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void C_MTXLightPerspective(); extern "C" void _savegpr_19(); extern "C" void _savegpr_22(); extern "C" void _savegpr_25(); @@ -238,9 +103,6 @@ extern "C" void _restgpr_22(); extern "C" void _restgpr_25(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); -extern "C" extern u8 const j3dDefaultMtx[48]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -248,8 +110,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -435,25 +295,30 @@ static dCcD_SrcCyl cc_cyl_src = { }; /* 80D1EF4C-80D1EF6C -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Tp_Method */ -SECTION_DATA static void* l_daObj_Tp_Method[8] = { - (void*)daObj_Tp_Create__FP10fopAc_ac_c, - (void*)daObj_Tp_Delete__FP12obj_tp_class, - (void*)daObj_Tp_Execute__FP12obj_tp_class, - (void*)daObj_Tp_IsDelete__FP12obj_tp_class, - (void*)daObj_Tp_Draw__FP12obj_tp_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObj_Tp_Method = { + (process_method_func)daObj_Tp_Create__FP10fopAc_ac_c, + (process_method_func)daObj_Tp_Delete__FP12obj_tp_class, + (process_method_func)daObj_Tp_Execute__FP12obj_tp_class, + (process_method_func)daObj_Tp_IsDelete__FP12obj_tp_class, + (process_method_func)daObj_Tp_Draw__FP12obj_tp_class, }; /* 80D1EF6C-80D1EF9C -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_TP */ -SECTION_DATA extern void* g_profile_OBJ_TP[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00300000, (void*)&g_fpcLf_Method, - (void*)0x00000784, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x003B0000, (void*)&l_daObj_Tp_Method, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_TP = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_TP, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(obj_tp_class), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 59, // mPriority + &l_daObj_Tp_Method, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D1EF9C-80D1EFA8 0000FC 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ @@ -505,7 +370,8 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tp/d_a_obj_tp/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_treesh/d_a_obj_treesh.cpp b/rel/d/a/obj/d_a_obj_treesh/d_a_obj_treesh.cpp index b32439488d8..2ef898352ff 100644 --- a/rel/d/a/obj/d_a_obj_treesh/d_a_obj_treesh.cpp +++ b/rel/d/a/obj/d_a_obj_treesh/d_a_obj_treesh.cpp @@ -1,95 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_treesh -// +/** + * @file d_a_obj_treesh.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_treesh/d_a_obj_treesh.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80D1F148 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct daTreeSh_c { - /* 80D1F258 */ void initBaseMtx(); - /* 80D1F294 */ void setBaseMtx(); - /* 80D1F2E8 */ void CreateHeap(); - /* 80D1F358 */ void Create(); - /* 80D1F414 */ void create1st(); - /* 80D1F49C */ void Execute(f32 (**)[3][4]); - /* 80D1F648 */ void Draw(); - /* 80D1F6EC */ void Delete(); -}; - -struct daTreeSh_HIO_c { - /* 80D1F0CC */ daTreeSh_HIO_c(); - /* 80D1F81C */ ~daTreeSh_HIO_c(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz { - /* 80D1F10C */ ~csXyz(); - /* 80D1F7AC */ csXyz(); -}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DSys { - static u8 mCurrentMtx[48]; -}; - -struct J3DModel {}; - -struct J3DJoint {}; // // Forward References: @@ -142,18 +59,13 @@ extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP extern "C" void cM_rndF__Ff(); extern "C" void cM_rndFX__Ff(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); extern "C" void __construct_array(); extern "C" void _savegpr_23(); extern "C" void _savegpr_28(); extern "C" void _restgpr_23(); extern "C" void _restgpr_28(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" void __register_global_object(); @@ -173,25 +85,30 @@ SECTION_DEAD static char const* const stringBase_80D1F8E8 = "M_TreeSh"; SECTION_DATA static void* l_arcName = (void*)&d_a_obj_treesh__stringBase0; /* 80D1F8F8-80D1F918 -00001 0020+00 1/0 0/0 0/0 .data daTreeSh_METHODS */ -SECTION_DATA static void* daTreeSh_METHODS[8] = { - (void*)daTreeSh_create1st__FP10daTreeSh_c, - (void*)daTreeSh_MoveBGDelete__FP10daTreeSh_c, - (void*)daTreeSh_MoveBGExecute__FP10daTreeSh_c, - (void*)NULL, - (void*)daTreeSh_MoveBGDraw__FP10daTreeSh_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daTreeSh_METHODS = { + (process_method_func)daTreeSh_create1st__FP10daTreeSh_c, + (process_method_func)daTreeSh_MoveBGDelete__FP10daTreeSh_c, + (process_method_func)daTreeSh_MoveBGExecute__FP10daTreeSh_c, + 0, + (process_method_func)daTreeSh_MoveBGDraw__FP10daTreeSh_c, }; /* 80D1F918-80D1F948 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TREESH */ -SECTION_DATA extern void* g_profile_TREESH[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00310000, (void*)&g_fpcLf_Method, - (void*)0x000005CC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01AF0000, (void*)&daTreeSh_METHODS, - (void*)0x00040180, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_TREESH = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_TREESH, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daTreeSh_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 431, // mPriority + &daTreeSh_METHODS, // sub_method + 0x00040180, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D1F948-80D1F970 000054 0028+00 1/1 0/0 0/0 .data __vt__10daTreeSh_c */ @@ -236,7 +153,8 @@ asm daTreeSh_HIO_c::daTreeSh_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm csXyz::~csXyz() { +// asm csXyz::~csXyz() { +extern "C" asm void __dt__5csXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_treesh/d_a_obj_treesh/__dt__5csXyzFv.s" } @@ -246,7 +164,8 @@ asm csXyz::~csXyz() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_treesh/d_a_obj_treesh/__dt__14mDoHIO_entry_cFv.s" } @@ -406,7 +325,8 @@ static asm void daTreeSh_create1st(daTreeSh_c* param_0) { #pragma pop /* 80D1F7AC-80D1F7B0 0007CC 0004+00 1/1 0/0 0/0 .text __ct__5csXyzFv */ -csXyz::csXyz() { +// csXyz::csXyz() { +extern "C" asm void __ct__5csXyzFv() { /* empty function */ } diff --git a/rel/d/a/obj/d_a_obj_twGate/d_a_obj_twGate.cpp b/rel/d/a/obj/d_a_obj_twGate/d_a_obj_twGate.cpp index 20f5979c63e..2ee3525a2c3 100644 --- a/rel/d/a/obj/d_a_obj_twGate/d_a_obj_twGate.cpp +++ b/rel/d/a/obj/d_a_obj_twGate/d_a_obj_twGate.cpp @@ -1,119 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_twGate -// +/** + * @file d_a_obj_twGate.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_twGate/d_a_obj_twGate.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80D1FB3C */ ~mDoHIO_entry_c(); -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c {}; - -struct fOpAcm_HIO_entry_c { - /* 80D1FAE0 */ ~fOpAcm_HIO_entry_c(); -}; - -struct daTwGate_c { - /* 80D1FB84 */ void setBaseMtx(); - /* 80D1FC0C */ void CreateHeap(); - /* 80D1FD44 */ void create(); - /* 80D1FFA4 */ void Execute(f32 (**)[3][4]); - /* 80D200B4 */ void Draw(); - /* 80D20180 */ void Delete(); -}; - -struct daTwGate_HIO_c { - /* 80D1FAAC */ daTwGate_HIO_c(); - /* 80D2024C */ ~daTwGate_HIO_c(); -}; - -struct dSv_player_status_b_c { - /* 80032BB0 */ void isDarkClearLV(int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW {}; -struct cBgS_PolyInfo {}; -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct Vec {}; - -struct cM3dGLin { - /* 8026F31C */ void SetStartEnd(Vec const&, Vec const&); - /* 80D1FF14 */ ~cM3dGLin(); -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80D1FF5C */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -172,18 +66,12 @@ extern "C" void cM3d_Len3dSqPntAndSegLine__FPC8cM3dGLinPC3VecP3VecPf(); extern "C" void SetStartEnd__8cM3dGLinFRC3VecRC3Vec(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void __register_global_object(); // @@ -228,25 +116,30 @@ SECTION_DATA static void* l_resNameIdx[13] = { }; /* 80D205E4-80D20604 -00001 0020+00 1/0 0/0 0/0 .data l_daTwGate_Method */ -SECTION_DATA static void* l_daTwGate_Method[8] = { - (void*)daTwGate_Create__FP10fopAc_ac_c, - (void*)daTwGate_Delete__FP10daTwGate_c, - (void*)daTwGate_Execute__FP10daTwGate_c, - (void*)NULL, - (void*)daTwGate_Draw__FP10daTwGate_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daTwGate_Method = { + (process_method_func)daTwGate_Create__FP10fopAc_ac_c, + (process_method_func)daTwGate_Delete__FP10daTwGate_c, + (process_method_func)daTwGate_Execute__FP10daTwGate_c, + 0, + (process_method_func)daTwGate_Draw__FP10daTwGate_c, }; /* 80D20604-80D20634 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_TwGate */ -SECTION_DATA extern void* g_profile_Obj_TwGate[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00510000, (void*)&g_fpcLf_Method, - (void*)0x000005FC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x021B0000, (void*)&l_daTwGate_Method, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_TwGate = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_TwGate, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daTwGate_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 539, // mPriority + &l_daTwGate_Method, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D20634-80D20640 000084 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGLin */ @@ -312,7 +205,8 @@ asm daTwGate_HIO_c::daTwGate_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { +// asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { +extern "C" asm void __dt__18fOpAcm_HIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_twGate/d_a_obj_twGate/__dt__18fOpAcm_HIO_entry_cFv.s" } @@ -322,7 +216,8 @@ asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_twGate/d_a_obj_twGate/__dt__14mDoHIO_entry_cFv.s" } @@ -474,7 +369,8 @@ asm void daTwGate_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGLin::~cM3dGLin() { +// asm cM3dGLin::~cM3dGLin() { +extern "C" asm void __dt__8cM3dGLinFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_twGate/d_a_obj_twGate/__dt__8cM3dGLinFv.s" } @@ -484,7 +380,8 @@ asm cM3dGLin::~cM3dGLin() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_twGate/d_a_obj_twGate/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_udoor/d_a_obj_udoor.cpp b/rel/d/a/obj/d_a_obj_udoor/d_a_obj_udoor.cpp index 82f0bf92cad..c8507e9d77e 100644 --- a/rel/d/a/obj/d_a_obj_udoor/d_a_obj_udoor.cpp +++ b/rel/d/a/obj/d_a_obj_udoor/d_a_obj_udoor.cpp @@ -1,77 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_udoor -// +/** + * @file d_a_obj_udoor.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_udoor/d_a_obj_udoor.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_udoor_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dComIfG_play_c { - /* 8002C97C */ void getLayerNo(int); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct csXyz {}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS_PolyInfo {}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -119,14 +54,10 @@ extern "C" void cLib_addCalcAngleS2__FPssss(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; @@ -134,7 +65,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -302,25 +232,30 @@ static dCcD_SrcSph cc_sph_src = { }; /* 80D20E6C-80D20E8C -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Udoor_Method */ -SECTION_DATA static void* l_daObj_Udoor_Method[8] = { - (void*)daObj_Udoor_Create__FP10fopAc_ac_c, - (void*)daObj_Udoor_Delete__FP15obj_udoor_class, - (void*)daObj_Udoor_Execute__FP15obj_udoor_class, - (void*)daObj_Udoor_IsDelete__FP15obj_udoor_class, - (void*)daObj_Udoor_Draw__FP15obj_udoor_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObj_Udoor_Method = { + (process_method_func)daObj_Udoor_Create__FP10fopAc_ac_c, + (process_method_func)daObj_Udoor_Delete__FP15obj_udoor_class, + (process_method_func)daObj_Udoor_Execute__FP15obj_udoor_class, + (process_method_func)daObj_Udoor_IsDelete__FP15obj_udoor_class, + (process_method_func)daObj_Udoor_Draw__FP15obj_udoor_class, }; /* 80D20E8C-80D20EBC -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_UDOOR */ -SECTION_DATA extern void* g_profile_OBJ_UDOOR[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01290000, (void*)&g_fpcLf_Method, - (void*)0x00000754, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x004D0000, (void*)&l_daObj_Udoor_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_UDOOR = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_UDOOR, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(obj_udoor_class), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 77, // mPriority + &l_daObj_Udoor_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D20EBC-80D20EC8 0000A0 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGSph */ diff --git a/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.cpp b/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.cpp index c6191fcc481..c3d943cd8dd 100644 --- a/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.cpp +++ b/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.cpp @@ -4,6 +4,7 @@ */ #include "rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.h" +#include "rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.h" #include "SSystem/SComponent/c_math.h" #include "d/a/d_a_player.h" #include "d/com/d_com_inf_game.h" @@ -12,140 +13,6 @@ #include "f_op/f_op_actor_mng.h" #include "global.h" -// -// Types: -// - -class daObjVolcBall_c : public fopAc_ac_c, public dEvLib_callback_c { -public: - enum mode_e { - /* 0 */ MODE_PLAYER_WAIT, - /* 1 */ MODE_SWITCH_WAIT, - /* 2 */ MODE_STOP, - /* 3 */ MODE_QUAKE, - /* 4 */ MODE_ERUPT, - /* 5 */ MODE_END, - }; - - struct vball_s { - /* 80D21FA8 */ ~vball_s(); - /* 80D2214C */ vball_s(); - - /* 0x000 */ J3DModel* mpModel; - /* 0x004 */ cXyz field_0x4; - /* 0x010 */ cXyz field_0x10; - /* 0x01C */ cXyz field_0x1c; - /* 0x028 */ cXyz field_0x28; - /* 0x034 */ csXyz field_0x34; - /* 0x03C */ cXyz field_0x3c; - /* 0x048 */ f32 field_0x48; - /* 0x04C */ f32 field_0x4c; - /* 0x050 */ f32 field_0x50; - /* 0x054 */ dBgS_ObjAcch mAcch; - /* 0x22C */ dCcD_Sph mSphCc; - /* 0x364 */ cXyz field_0x364; - /* 0x370 */ u32 field_0x370; - /* 0x374 */ s16 field_0x374; - /* 0x376 */ u8 field_0x376; - /* 0x378 */ csXyz field_0x378; - /* 0x37E */ u8 field_0x37E[0x0390 - 0x037E]; - /* 0x390 */ dPa_followEcallBack field_0x390[4]; - }; - - class volc_param_c { - public: - /* 0x00 */ f32 mGravity; - /* 0x04 */ f32 mMaxFallSpeed; - /* 0x08 */ f32 mBallSpeedH; - /* 0x0C */ f32 mBallSetShortRange; - /* 0x10 */ f32 mBallSetRandom; - /* 0x14 */ f32 mNormalScale; - /* 0x18 */ f32 mScaleRandValue; - /* 0x1C */ f32 mNormalInterval; - /* 0x20 */ f32 mRandInterval; - /* 0x24 */ f32 mNormalWaitTime; - /* 0x28 */ f32 mRandWaitTime; - /* 0x2C */ f32 mNormalWarningTime; - /* 0x30 */ f32 mRandWarningTime; - /* 0x34 */ f32 mNormalEruptTime; - /* 0x38 */ f32 mRandEruptTime; - /* 0x3C */ f32 mSearchBallFreq; - /* 0x40 */ f32 mSearchBallBaseScale; - /* 0x44 */ f32 mSearchBallRandScale; - /* 0x48 */ f32 mSearchBallSetHeight; - /* 0x4C */ f32 mSearchBallShadowIntensity; - /* 0x50 */ u8 mSearchBallCreateTime; - /* 0x51 */ u8 mPlayerSearchTime; - }; - - daObjVolcBall_c() : dEvLib_callback_c(this) {} - - /* 80D21B18 */ volc_param_c* getData(); - /* 80D21BA0 */ void initBaseMtx(); - /* 80D21BC0 */ void setBaseMtx(); - /* 80D21C40 */ int Create(); - /* 80D21D80 */ int CreateHeap(); - /* 80D21E28 */ int create(); - /* 80D22424 */ int execute(); - /* 80D22484 */ void action(); - /* 80D22570 */ void initActionPlayerWait(); - /* 80D2257C */ void initActionWarning(); - /* 80D225A4 */ void initActionSwWait(); - /* 80D225B0 */ void actionPlayerWait(); - /* 80D2267C */ void actionSwWait(); - /* 80D22724 */ void actionStop(); - /* 80D227E4 */ void actionWarning(); - /* 80D22944 */ void actionEruption(); - /* 80D22C6C */ void initActionEnd(); - /* 80D22CD4 */ void actionEnd(); - /* 80D22E24 */ void setEruptEffect(int); - /* 80D22ED4 */ void setFallEffect(int); - /* 80D22FCC */ void endFallEffect(int); - /* 80D23034 */ bool createSearchBall(); - /* 80D23188 */ bool createNormalBall(); - /* 80D23438 */ int executeBall(); - /* 80D23868 */ void startQuake(); - /* 80D23904 */ int draw(); - /* 80D23A0C */ int _delete(); - - /* 80D23B24 */ virtual ~daObjVolcBall_c(); - /* 80D22DDC */ virtual BOOL eventStart(); - - u8 getSwBit() { return fopAcM_GetParamBit(this, 0, 8); } - u8 getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); } - u8 checkBigVolc() { return fopAcM_GetParamBit(this, 0x1F, 1); } - u8 getEvNo() { return fopAcM_GetParamBit(this, 0x10, 8); } - - void setAction(u8 i_action) { mMode = i_action; } - - /* 0x057C */ request_of_phase_process_class mPhase; - /* 0x0584 */ dBgS_AcchCir mAcchCir; - /* 0x05C4 */ dCcD_Stts mCcStts; - /* 0x0600 */ u8 mIsBigVolc; - /* 0x0601 */ u8 mMode; - /* 0x0602 */ u8 mNormalBallCreateTimer; - /* 0x0603 */ u8 field_0x603; - /* 0x0604 */ u32 mTime; - /* 0x0608 */ u32 mSearchBallCreateTimer; - /* 0x060C */ vball_s mBall[9]; - /* 0x28EC */ Mtx field_0x28ec; - /* 0x291C */ f32 field_0x291c; - /* 0x2920 */ u32 mBigVolcActorID; - /* 0x2924 */ u8 field_0x2924; - /* 0x2925 */ u8 field_0x2925; - /* 0x2926 */ u8 field_0x2926; -}; - -class daObjVolcBom_c { -public: - void startFall() { field_0x95f = 1; } - void startSearch() { field_0x960 = 1; } - - u8 temp[0x95F]; - /* 0x95F */ u8 field_0x95f; - /* 0x960 */ u8 field_0x960; -}; - // // Forward References: // @@ -553,7 +420,8 @@ extern "C" asm void __dt__19dPa_followEcallBackFv() { #pragma pop /* 80D22148-80D2214C 0006A8 0004+00 1/0 0/0 0/0 .text cleanup__18dPa_levelEcallBackFv */ -void dPa_levelEcallBack::cleanup() { +// void dPa_levelEcallBack::cleanup() { +extern "C" asm void cleanup__18dPa_levelEcallBackFv() { /* empty function */ } @@ -573,7 +441,8 @@ asm daObjVolcBall_c::vball_s::vball_s() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dPa_followEcallBack::__defctor() { +// asm void dPa_followEcallBack::__defctor() { +extern "C" asm void __defctor__19dPa_followEcallBackFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/__defctor__19dPa_followEcallBackFv.s" } @@ -1352,25 +1221,30 @@ static int daObjVolcBall_Create(fopAc_ac_c* i_this) { } /* 80D23FE8-80D24008 -00001 0020+00 1/0 0/0 0/0 .data l_daObjVolcBall_Method */ -SECTION_DATA static void* l_daObjVolcBall_Method[8] = { - (void*)daObjVolcBall_Create__FP10fopAc_ac_c, - (void*)daObjVolcBall_Delete__FP15daObjVolcBall_c, - (void*)daObjVolcBall_Execute__FP15daObjVolcBall_c, - (void*)NULL, - (void*)daObjVolcBall_Draw__FP15daObjVolcBall_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjVolcBall_Method = { + (process_method_func)daObjVolcBall_Create__FP10fopAc_ac_c, + (process_method_func)daObjVolcBall_Delete__FP15daObjVolcBall_c, + (process_method_func)daObjVolcBall_Execute__FP15daObjVolcBall_c, + 0, + (process_method_func)daObjVolcBall_Draw__FP15daObjVolcBall_c, }; /* 80D24008-80D24038 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_VolcanicBall */ -SECTION_DATA extern void* g_profile_Obj_VolcanicBall[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00E00000, (void*)&g_fpcLf_Method, - (void*)0x00002928, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02510000, (void*)&l_daObjVolcBall_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_VolcanicBall = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_VolcanicBall, // mProcName + &g_fpcLf_Method.mBase, // sub_method + 0x00002928, // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 593, // mPriority + &l_daObjVolcBall_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D24038-80D24060 0001AC 0028+00 2/2 0/0 0/0 .data __vt__15daObjVolcBall_c */ @@ -1548,7 +1422,7 @@ extern "C" void drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter(JPAEmitterCall /* 80D23D64-80D23D6C 0022C4 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv */ -// bool dEvLib_callback_c::eventStart() { +// bool dEvLib_callback_c::eventStart()() { extern "C" int eventStart__17dEvLib_callback_cFv(void* this_) { return true; } diff --git a/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.cpp b/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.cpp index 9054bcdd32b..71f5dfee416 100644 --- a/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.cpp +++ b/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.cpp @@ -1,259 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_volcbom -// +/** + * @file d_a_obj_volcbom.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c {}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static f32 mGroundY; -}; - -struct daPy_py_c { - static u8 m_midnaActor[4]; -}; - -struct daObjVolcBom_c { - /* 80D241E0 */ void initBaseMtx(); - /* 80D24238 */ void setBaseMtx(); - /* 80D242A8 */ void Create(); - /* 80D244E0 */ void CreateHeap(); - /* 80D248F4 */ void create1st(); - /* 80D249D0 */ void Execute(f32 (**)[3][4]); - /* 80D24A2C */ void mode_proc_call(); - /* 80D24B18 */ void init_modeWaitAppear(); - /* 80D24B6C */ void modeWaitAppear(); - /* 80D24D80 */ void init_modeFall(); - /* 80D24E50 */ void modeFall(); - /* 80D25024 */ void init_modeWaitEndFallDemo(); - /* 80D25038 */ void modeWaitEndFallDemo(); - /* 80D25094 */ void init_modeWait(); - /* 80D25100 */ void modeWait(); - /* 80D25178 */ void clrDzb(); - /* 80D251CC */ void setDzb(); - /* 80D25224 */ void appear(); - /* 80D25230 */ void disappear(); - /* 80D2523C */ void setSmoke(); - /* 80D252C8 */ void checkTalkDistance(); - /* 80D25364 */ void calcMidnaWaitPos(); - /* 80D253FC */ void setSrcEffect(); - /* 80D25528 */ void setBindEffect(); - /* 80D255F4 */ void followBindEffect(); - /* 80D25664 */ void endBindEffect(); - /* 80D256B8 */ void followSrcEffect(); - /* 80D25758 */ void endSrcEffect(); - /* 80D257E4 */ void event_proc_call(); - /* 80D25914 */ void orderZHintEvent(); - /* 80D25A08 */ void actionWait(); - /* 80D25B04 */ void actionOrderEvent(); - /* 80D25CA0 */ void actionOrderATalkEvent(); - /* 80D25DEC */ void actionTalkEvent(); - /* 80D25E78 */ void actionWarpEvent(); - /* 80D25EE4 */ void actionDead(); - /* 80D25EE8 */ void demoProc(); - /* 80D26468 */ void calcObjPos(); - /* 80D264E8 */ void Draw(); - /* 80D266FC */ void Delete(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dMsgFlow_c { - /* 80249F00 */ dMsgFlow_c(); - /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**); - /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int); - /* 8024A528 */ void getEventId(int*); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); - /* 80042914 */ void setSkipProc(void*, int (*)(void*, int), int); - /* 8004365C */ void setPt2(void*); -}; - -struct dEvent_manager_c { - /* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8); - /* 800479F8 */ void startCheck(s16); - /* 80047A78 */ void endCheck(s16); - /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int); - /* 80047D4C */ void getIsAddvance(int); - /* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int); - /* 800480EC */ void getMySubstanceP(int, char const*, int); - /* 8004817C */ void cutEnd(int); - /* 800483E8 */ void getRunEventName(); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dBgW_Base {}; - -struct dBgW {}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80D26A04 */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80D26994 */ ~dBgS_AcchCir(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct dAttHint_c { - /* 800738FC */ void request(fopAc_ac_c*, int); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct _GXTexObj {}; - -struct JUTNameTab { - /* 802DEAF8 */ void getName(u16) const; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80D248AC */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -406,8 +159,6 @@ extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void getName__10JUTNameTabCFUs(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_25(); extern "C" void _savegpr_26(); @@ -419,8 +170,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -430,9 +179,7 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" u8 m_midnaActor__9daPy_py_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -753,25 +500,30 @@ SECTION_DATA static void* action_table[4] = { }; /* 80D26DC4-80D26DE4 -00001 0020+00 1/0 0/0 0/0 .data daObjVolcBom_METHODS */ -SECTION_DATA static void* daObjVolcBom_METHODS[8] = { - (void*)daObjVolcBom_create1st__FP14daObjVolcBom_c, - (void*)daObjVolcBom_MoveBGDelete__FP14daObjVolcBom_c, - (void*)daObjVolcBom_MoveBGExecute__FP14daObjVolcBom_c, - (void*)NULL, - (void*)daObjVolcBom_MoveBGDraw__FP14daObjVolcBom_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjVolcBom_METHODS = { + (process_method_func)daObjVolcBom_create1st__FP14daObjVolcBom_c, + (process_method_func)daObjVolcBom_MoveBGDelete__FP14daObjVolcBom_c, + (process_method_func)daObjVolcBom_MoveBGExecute__FP14daObjVolcBom_c, + 0, + (process_method_func)daObjVolcBom_MoveBGDraw__FP14daObjVolcBom_c, }; /* 80D26DE4-80D26E14 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_VolcanicBomb */ -SECTION_DATA extern void* g_profile_Obj_VolcanicBomb[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00E10000, (void*)&g_fpcLf_Method, - (void*)0x00000A1C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02520000, (void*)&daObjVolcBom_METHODS, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_VolcanicBomb = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_VolcanicBomb, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjVolcBom_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 594, // mPriority + &daObjVolcBom_METHODS, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D26E14-80D26E20 0001C0 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ @@ -843,7 +595,8 @@ asm void daObjVolcBom_c::CreateHeap() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom/__dt__12J3DFrameCtrlFv.s" } @@ -1472,7 +1225,8 @@ extern "C" asm void __dt__10dCcD_GSttsFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom/__dt__12dBgS_AcchCirFv.s" } @@ -1482,7 +1236,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom/__dt__12dBgS_ObjAcchFv.s" } diff --git a/rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.cpp b/rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.cpp index 69486774d9a..6e01b58db8e 100644 --- a/rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.cpp +++ b/rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.cpp @@ -1,231 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_warp_kbrg -// +/** + * @file d_a_obj_warp_kbrg.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE38 */ void scaleM(f32, f32, f32); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c {}; - -struct daPy_py_c { - static u8 m_midnaActor[4]; -}; - -struct daObjWarpKBrg_c { - /* 80D26FA8 */ void initBaseMtx(); - /* 80D27008 */ void setBaseMtx(); - /* 80D270C4 */ void Create(); - /* 80D27300 */ void CreateHeap(); - /* 80D276B4 */ void create1st(); - /* 80D2781C */ void Execute(f32 (**)[3][4]); - /* 80D27890 */ void event_proc_call(); - /* 80D27A38 */ void orderZHintEvent(); - /* 80D27B2C */ void actionWait(); - /* 80D27C6C */ void actionOrderEvent(); - /* 80D27E08 */ void actionWaitWarpEvent(); - /* 80D27ED0 */ void actionOrderATalkEvent(); - /* 80D28040 */ void actionTalkEvent(); - /* 80D280CC */ void actionWarpEvent(); - /* 80D28144 */ void actionDead(); - /* 80D28148 */ void actionWait2(); - /* 80D2814C */ void actionOrderEvent2(); - /* 80D281E4 */ void actionWarpEvent2(); - /* 80D28248 */ void actionDead2(); - /* 80D2824C */ void demoProc(); - /* 80D28A50 */ void calcObjPos(); - /* 80D28AE0 */ void checkTalkDistance(); - /* 80D28B7C */ void calcMidnaWaitPos(); - /* 80D28C10 */ void setBindEffect(); - /* 80D28CDC */ void followBindEffect(); - /* 80D28D4C */ void setSrcEffect(); - /* 80D28E9C */ void setDstEffect(); - /* 80D28FEC */ void followSrcEffect(); - /* 80D290A8 */ void followDstEffect(); - /* 80D29158 */ void endSrcEffect(); - /* 80D291FC */ void endDstEffect(); - /* 80D292A0 */ void Draw(); - /* 80D29448 */ void Delete(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 8003498C */ void onEventBit(u16); - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dMsgFlow_c { - /* 80249F00 */ dMsgFlow_c(); - /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**); - /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int); - /* 8024A528 */ void getEventId(int*); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); - /* 80042914 */ void setSkipProc(void*, int (*)(void*, int), int); - /* 8004365C */ void setPt2(void*); -}; - -struct dEvent_manager_c { - /* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8); - /* 800479F8 */ void startCheck(s16); - /* 80047A78 */ void endCheck(s16); - /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int); - /* 80047D4C */ void getIsAddvance(int); - /* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int); - /* 800480EC */ void getMySubstanceP(int, char const*, int); - /* 8004817C */ void cutEnd(int); - /* 800483E8 */ void getRunEventName(); -}; - -struct dBgW_Base {}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct dAttHint_c { - /* 800738FC */ void request(fopAc_ac_c*, int); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JUTNameTab { - /* 802DEAF8 */ void getName(u16) const; -}; - -struct JGeometry { - template - struct TVec3 {}; - /* TVec3 */ - struct TVec3__template0 {}; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80D2766C */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -347,9 +128,6 @@ extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void getName__10JUTNameTabCFUs(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECSquareDistance(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_23(); extern "C" void _savegpr_25(); @@ -361,16 +139,10 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void strcmp(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; extern "C" u8 m_midnaActor__9daPy_py_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_80D29928[4]; @@ -793,25 +565,30 @@ SECTION_DATA static void* lit_4533[7] = { }; /* 80D298A4-80D298C4 -00001 0020+00 1/0 0/0 0/0 .data daObjWarpKBrg_METHODS */ -SECTION_DATA static void* daObjWarpKBrg_METHODS[8] = { - (void*)daObjWarpKBrg_create1st__FP15daObjWarpKBrg_c, - (void*)daObjWarpKBrg_MoveBGDelete__FP15daObjWarpKBrg_c, - (void*)daObjWarpKBrg_MoveBGExecute__FP15daObjWarpKBrg_c, - (void*)NULL, - (void*)daObjWarpKBrg_MoveBGDraw__FP15daObjWarpKBrg_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjWarpKBrg_METHODS = { + (process_method_func)daObjWarpKBrg_create1st__FP15daObjWarpKBrg_c, + (process_method_func)daObjWarpKBrg_MoveBGDelete__FP15daObjWarpKBrg_c, + (process_method_func)daObjWarpKBrg_MoveBGExecute__FP15daObjWarpKBrg_c, + 0, + (process_method_func)daObjWarpKBrg_MoveBGDraw__FP15daObjWarpKBrg_c, }; /* 80D298C4-80D298F4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_KakarikoBrg */ -SECTION_DATA extern void* g_profile_Obj_KakarikoBrg[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00DA0000, (void*)&g_fpcLf_Method, - (void*)0x0000069C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02120000, (void*)&daObjWarpKBrg_METHODS, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_KakarikoBrg = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_KakarikoBrg, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjWarpKBrg_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 530, // mPriority + &daObjWarpKBrg_METHODS, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D298F4-80D29900 0001E4 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ @@ -835,7 +612,8 @@ asm void daObjWarpKBrg_c::CreateHeap() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg.cpp b/rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg.cpp index b88f25ed419..541ae2076da 100644 --- a/rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg.cpp +++ b/rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg.cpp @@ -1,207 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_warp_obrg -// +/** + * @file d_a_obj_warp_obrg.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c {}; - -struct daPy_py_c { - static u8 m_midnaActor[4]; -}; - -struct daObjWarpOBrg_c { - /* 80D299B8 */ void initBaseMtx(); - /* 80D29A00 */ void setBaseMtx(); - /* 80D29ACC */ void Create(); - /* 80D29BB4 */ void CreateHeap(); - /* 80D29E7C */ void create1st(); - /* 80D2A008 */ void Execute(f32 (**)[3][4]); - /* 80D2A04C */ void event_proc_call(); - /* 80D2A194 */ void actionWait(); - /* 80D2A4CC */ void actionOrderEvent(); - /* 80D2A740 */ void actionTalkEvent(); - /* 80D2A7C4 */ void actionWarpEvent(); - /* 80D2A93C */ void actionOrderEventDst(); - /* 80D2A9E4 */ void actionWarpEventDst(); - /* 80D2AA30 */ void actionDead(); - /* 80D2AA34 */ void demoProc(); - /* 80D2B3BC */ void checkTalkDistance(); - /* 80D2B534 */ void calcMidnaWaitPos(); - /* 80D2B5C8 */ void Draw(); - /* 80D2B6C0 */ void Delete(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dSv_event_tmp_flag_c { - static u8 const tempBitLabels[370 + 2 /* padding */]; -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 8003498C */ void onEventBit(u16); - /* 800349A4 */ void offEventBit(u16); - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dMsgFlow_c { - /* 80249F00 */ dMsgFlow_c(); - /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**); - /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int); - /* 8024A528 */ void getEventId(int*); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); - /* 80042914 */ void setSkipProc(void*, int (*)(void*, int), int); - /* 8004365C */ void setPt2(void*); -}; - -struct dEvent_manager_c { - /* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8); - /* 800479F8 */ void startCheck(s16); - /* 80047A78 */ void endCheck(s16); - /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int); - /* 80047D4C */ void getIsAddvance(int); - /* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int); - /* 800480EC */ void getMySubstanceP(int, char const*, int); - /* 8004817C */ void cutEnd(int); - /* 800483E8 */ void getRunEventName(); -}; - -struct dBgW_Base {}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dAttHint_c { - /* 800738FC */ void request(fopAc_ac_c*, int); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JGeometry { - template - struct TVec3 {}; - /* TVec3 */ - struct TVec3__template0 {}; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 8032842C */ void checkPass(f32); - /* 80D29E34 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -303,9 +108,6 @@ extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); extern "C" void checkPass__12J3DFrameCtrlFf(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECSquareDistance(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_19(); extern "C" void _savegpr_26(); @@ -313,17 +115,11 @@ extern "C" void _savegpr_28(); extern "C" void _restgpr_19(); extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); -extern "C" void strcmp(); extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; extern "C" u8 m_midnaActor__9daPy_py_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_80D2BA88[4]; @@ -630,25 +426,30 @@ SECTION_DATA static void* action_table[4] = { }; /* 80D2BA00-80D2BA20 -00001 0020+00 1/0 0/0 0/0 .data daObjWarpOBrg_METHODS */ -SECTION_DATA static void* daObjWarpOBrg_METHODS[8] = { - (void*)daObjWarpOBrg_create1st__FP15daObjWarpOBrg_c, - (void*)daObjWarpOBrg_MoveBGDelete__FP15daObjWarpOBrg_c, - (void*)daObjWarpOBrg_MoveBGExecute__FP15daObjWarpOBrg_c, - (void*)NULL, - (void*)daObjWarpOBrg_MoveBGDraw__FP15daObjWarpOBrg_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjWarpOBrg_METHODS = { + (process_method_func)daObjWarpOBrg_create1st__FP15daObjWarpOBrg_c, + (process_method_func)daObjWarpOBrg_MoveBGDelete__FP15daObjWarpOBrg_c, + (process_method_func)daObjWarpOBrg_MoveBGExecute__FP15daObjWarpOBrg_c, + 0, + (process_method_func)daObjWarpOBrg_MoveBGDraw__FP15daObjWarpOBrg_c, }; /* 80D2BA20-80D2BA50 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_OrdinBrg */ -SECTION_DATA extern void* g_profile_Obj_OrdinBrg[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00DB0000, (void*)&g_fpcLf_Method, - (void*)0x00000640, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02130000, (void*)&daObjWarpOBrg_METHODS, - (void*)0x00040000, (void*)0x030E0000, +extern actor_process_profile_definition g_profile_Obj_OrdinBrg = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_OrdinBrg, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjWarpOBrg_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 531, // mPriority + &daObjWarpOBrg_METHODS, // sub_method + 0x00040000, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D2BA50-80D2BA5C 00013C 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ @@ -672,7 +473,8 @@ asm void daObjWarpOBrg_c::CreateHeap() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_waterGate/d_a_obj_waterGate.cpp b/rel/d/a/obj/d_a_obj_waterGate/d_a_obj_waterGate.cpp index d0560ed0cb2..15f5e5c361a 100644 --- a/rel/d/a/obj/d_a_obj_waterGate/d_a_obj_waterGate.cpp +++ b/rel/d/a/obj/d_a_obj_waterGate/d_a_obj_waterGate.cpp @@ -1,105 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_waterGate -// +/** + * @file d_a_obj_waterGate.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_waterGate/d_a_obj_waterGate.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80D2BBC4 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct daWtGate_c { - /* 80D2BC0C */ void setBaseMtx(); - /* 80D2BC94 */ void CreateHeap(); - /* 80D2BD00 */ void create(); - /* 80D2BE7C */ void Execute(f32 (**)[3][4]); - /* 80D2BECC */ void move(); - /* 80D2BF88 */ void init_modeWait(); - /* 80D2BF94 */ void modeWait(); - /* 80D2C010 */ void init_modeOpen(); - /* 80D2C02C */ void modeOpen(); - /* 80D2C134 */ void init_modeClose(); - /* 80D2C150 */ void modeClose(); - /* 80D2C250 */ void init_modeEnd(); - /* 80D2C25C */ void modeEnd(); - /* 80D2C260 */ void Draw(); - /* 80D2C304 */ void Delete(); -}; - -struct daWtGate_HIO_c { - /* 80D2BB8C */ daWtGate_HIO_c(); - /* 80D2C3C0 */ ~daWtGate_HIO_c(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; // // Forward References: @@ -159,15 +66,9 @@ extern "C" void cLib_addCalc__FPfffff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -249,25 +150,30 @@ SECTION_DATA static u8 mode_proc[48] = { #pragma pop /* 80D2C518-80D2C538 -00001 0020+00 1/0 0/0 0/0 .data l_daWtGate_Method */ -SECTION_DATA static void* l_daWtGate_Method[8] = { - (void*)daWtGate_Create__FP10fopAc_ac_c, - (void*)daWtGate_Delete__FP10daWtGate_c, - (void*)daWtGate_Execute__FP10daWtGate_c, - (void*)NULL, - (void*)daWtGate_Draw__FP10daWtGate_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daWtGate_Method = { + (process_method_func)daWtGate_Create__FP10fopAc_ac_c, + (process_method_func)daWtGate_Delete__FP10daWtGate_c, + (process_method_func)daWtGate_Execute__FP10daWtGate_c, + 0, + (process_method_func)daWtGate_Draw__FP10daWtGate_c, }; /* 80D2C538-80D2C568 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_WtGate */ -SECTION_DATA extern void* g_profile_Obj_WtGate[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00480000, (void*)&g_fpcLf_Method, - (void*)0x000005BC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x020A0000, (void*)&l_daWtGate_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_WtGate = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_WtGate, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daWtGate_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 522, // mPriority + &l_daWtGate_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D2C568-80D2C590 0000D0 0028+00 1/1 0/0 0/0 .data __vt__10daWtGate_c */ @@ -312,7 +218,8 @@ asm daWtGate_HIO_c::daWtGate_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_waterGate/d_a_obj_waterGate/__dt__14mDoHIO_entry_cFv.s" } diff --git a/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar.cpp b/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar.cpp index c8fdfb59c81..1f04270469e 100644 --- a/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar.cpp +++ b/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar.cpp @@ -1,252 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_waterPillar -// +/** + * @file d_a_obj_waterPillar.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80D2C768 */ ~mDoHIO_entry_c(); -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daWtPillar_c { - /* 80D2C7B0 */ void setBaseMtx(); - /* 80D2C838 */ void createHeapCallBack(fopAc_ac_c*); - /* 80D2C858 */ void CreateHeap(); - /* 80D2C960 */ void create(); - /* 80D2CC0C */ void execute(); - /* 80D2CE4C */ void actionMain(); - /* 80D2CF98 */ void effectSet(); - /* 80D2D278 */ void effectSet2(); - /* 80D2D3FC */ void actionSwWaitInit(); - /* 80D2D408 */ void actionSwWait(); - /* 80D2D488 */ void eventStart(); - /* 80D2D4AC */ void actionWaitInit(); - /* 80D2D588 */ void actionWait(); - /* 80D2D5C0 */ void actionUpFirstInit(); - /* 80D2D6C4 */ void actionUpFirst(); - /* 80D2D73C */ void actionUpFirstWaitInit(); - /* 80D2D780 */ void actionUpFirstWait(); - /* 80D2D7B8 */ void actionUpInit(); - /* 80D2D850 */ void actionUp(); - /* 80D2D95C */ void actionUpWaitInit(); - /* 80D2D9A0 */ void actionUpWait(); - /* 80D2DA58 */ void actionDownInit(); - /* 80D2DA78 */ void actionDown(); - /* 80D2DB68 */ void actionRockWaitInit(); - /* 80D2DB74 */ void actionRockWait(); - /* 80D2DC20 */ void actionRockOnInit(); - /* 80D2DC2C */ void actionRockOn(); - /* 80D2DD0C */ void actionEndInit(); - /* 80D2DD18 */ void actionEnd(); - /* 80D2DDB0 */ void getPillarHeight(); - /* 80D2DDB8 */ void draw(); - /* 80D2DE84 */ void _delete(); - /* 80D2E054 */ daWtPillar_c(); - /* 80D2E430 */ ~daWtPillar_c(); - - static u8 const mCcDObjInfo[48]; - static u8 const mCcDObjCoInfo[48]; - static u8 mCcDCps[76]; - static u8 mCcDCyl[68]; -}; - -struct daWtPillar_HIO_c { - /* 80D2C6CC */ daWtPillar_HIO_c(); - /* 80D2DF34 */ ~daWtPillar_HIO_c(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct Vec {}; - -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; -}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dEvLib_callback_c { - /* 8004886C */ void eventUpdate(); - /* 80048940 */ void orderEvent(int, int, int); - /* 80D2E6FC */ ~dEvLib_callback_c(); - /* 80D2E744 */ bool eventRun(); - /* 80D2E74C */ bool eventEnd(); - /* 80D2E754 */ bool eventStart(); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; -struct dCcD_SrcCps {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80D2E2AC */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct dCcD_Cps { - /* 800847D0 */ void Set(dCcD_SrcCps const&); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80D2E378 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80D2E308 */ ~dBgS_AcchCir(); -}; - -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80D2E21C */ ~cM3dGCyl(); -}; - -struct cM3dGCpsS {}; - -struct cM3dGCps { - /* 8026EF88 */ cM3dGCps(); - /* 8026EFA4 */ ~cM3dGCps(); - /* 8026F03C */ void Set(cM3dGCpsS const&); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 80D2E264 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80D2E6B4 */ ~cCcD_GStts(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80D2E3E8 */ ~J3DFrameCtrl(); -}; // // Forward References: @@ -372,9 +132,6 @@ extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void __ptmf_scall(); extern "C" void __cvt_fp2unsigned(); extern "C" void _savegpr_24(); @@ -383,8 +140,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_24(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__8dCcD_Cps[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -394,8 +149,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -640,25 +393,30 @@ SECTION_DATA static u8 l_eff[14 + 2 /* padding */] = { }; /* 80D2EA14-80D2EA34 -00001 0020+00 1/0 0/0 0/0 .data l_daWtPillar_Method */ -SECTION_DATA static void* l_daWtPillar_Method[8] = { - (void*)daWtPillar_Create__FP10fopAc_ac_c, - (void*)daWtPillar_Delete__FP12daWtPillar_c, - (void*)daWtPillar_Execute__FP12daWtPillar_c, - (void*)NULL, - (void*)daWtPillar_Draw__FP12daWtPillar_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daWtPillar_Method = { + (process_method_func)daWtPillar_Create__FP10fopAc_ac_c, + (process_method_func)daWtPillar_Delete__FP12daWtPillar_c, + (process_method_func)daWtPillar_Execute__FP12daWtPillar_c, + 0, + (process_method_func)daWtPillar_Draw__FP12daWtPillar_c, }; /* 80D2EA34-80D2EA64 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_WaterPillar */ -SECTION_DATA extern void* g_profile_Obj_WaterPillar[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00440000, (void*)&g_fpcLf_Method, - (void*)0x00000B7C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02080000, (void*)&l_daWtPillar_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_WaterPillar = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_WaterPillar, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daWtPillar_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 520, // mPriority + &l_daWtPillar_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D2EA64-80D2EA8C 000218 0028+00 2/2 0/0 0/0 .data __vt__12daWtPillar_c */ @@ -768,7 +526,8 @@ asm daWtPillar_HIO_c::daWtPillar_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar/__dt__14mDoHIO_entry_cFv.s" } @@ -1404,7 +1163,8 @@ asm daWtPillar_c::daWtPillar_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar/__dt__8cM3dGCylFv.s" } @@ -1414,7 +1174,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar/__dt__8cM3dGAabFv.s" } @@ -1424,7 +1185,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar/__dt__10dCcD_GSttsFv.s" } @@ -1434,7 +1196,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar/__dt__12dBgS_AcchCirFv.s" } @@ -1444,7 +1207,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar/__dt__12dBgS_ObjAcchFv.s" } @@ -1454,7 +1218,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar/__dt__12J3DFrameCtrlFv.s" } @@ -1474,7 +1239,8 @@ asm daWtPillar_c::~daWtPillar_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar/__dt__10cCcD_GSttsFv.s" } @@ -1484,25 +1250,29 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dEvLib_callback_c::~dEvLib_callback_c() { +// asm dEvLib_callback_c::~dEvLib_callback_c() { +extern "C" asm void __dt__17dEvLib_callback_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar/__dt__17dEvLib_callback_cFv.s" } #pragma pop /* 80D2E744-80D2E74C 002164 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventRun() { +// bool dEvLib_callback_c::eventRun() { +extern "C" bool eventRun__17dEvLib_callback_cFv() { return true; } /* 80D2E74C-80D2E754 00216C 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventEnd() { +// bool dEvLib_callback_c::eventEnd() { +extern "C" bool eventEnd__17dEvLib_callback_cFv() { return true; } /* 80D2E754-80D2E75C 002174 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventStart() { +// bool dEvLib_callback_c::eventStart() { +extern "C" bool eventStart__17dEvLib_callback_cFv() { return true; } diff --git a/rel/d/a/obj/d_a_obj_waterfall/d_a_obj_waterfall.cpp b/rel/d/a/obj/d_a_obj_waterfall/d_a_obj_waterfall.cpp index 6483fa1c527..f8cb74427d2 100644 --- a/rel/d/a/obj/d_a_obj_waterfall/d_a_obj_waterfall.cpp +++ b/rel/d/a/obj/d_a_obj_waterfall/d_a_obj_waterfall.cpp @@ -1,52 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_waterfall -// +/** + * @file d_a_obj_waterfall.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_waterfall/d_a_obj_waterfall.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObjWaterFall_c { - /* 80D2ED14 */ void search_bomb(); - /* 80D2F034 */ void search_arrow(); - /* 80D2F324 */ void initBaseMtx(); - /* 80D2F344 */ void setBaseMtx(); - /* 80D2F39C */ void Create(); - /* 80D2F5A0 */ void create(); - /* 80D2F984 */ void execute(); - /* 80D2FA6C */ void push_player(); - /* 80D2FC94 */ bool draw(); - /* 80D2FC9C */ void _delete(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dBomb_c { - /* 80031FF4 */ void checkWaterBomb(fopAc_ac_c*); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; // // Forward References: @@ -107,15 +67,11 @@ extern "C" void SetH__8cM3dGCylFf(); extern "C" void SetR__8cM3dGCylFf(); extern "C" void cLib_chasePosXZ__FP4cXyzRC4cXyzf(); extern "C" void __dl__FPv(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void __construct_array(); extern "C" void _savegpr_23(); extern "C" void _savegpr_29(); extern "C" void _restgpr_23(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__8dCcD_Tri[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -286,25 +242,30 @@ asm void daObjWaterFall_c::Create() { /* ############################################################################################## */ /* 80D2FDCC-80D2FDEC -00001 0020+00 1/0 0/0 0/0 .data l_daObjWaterFall_Method */ -SECTION_DATA static void* l_daObjWaterFall_Method[8] = { - (void*)daObjWaterFall_Create__FP10fopAc_ac_c, - (void*)daObjWaterFall_Delete__FP16daObjWaterFall_c, - (void*)daObjWaterFall_Execute__FP16daObjWaterFall_c, - (void*)NULL, - (void*)daObjWaterFall_Draw__FP16daObjWaterFall_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjWaterFall_Method = { + (process_method_func)daObjWaterFall_Create__FP10fopAc_ac_c, + (process_method_func)daObjWaterFall_Delete__FP16daObjWaterFall_c, + (process_method_func)daObjWaterFall_Execute__FP16daObjWaterFall_c, + 0, + (process_method_func)daObjWaterFall_Draw__FP16daObjWaterFall_c, }; /* 80D2FDEC-80D2FE1C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_WaterFall */ -SECTION_DATA extern void* g_profile_Obj_WaterFall[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01770000, (void*)&g_fpcLf_Method, - (void*)0x000009CC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x021F0000, (void*)&l_daObjWaterFall_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_WaterFall = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_WaterFall, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjWaterFall_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 543, // mPriority + &l_daObjWaterFall_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D2FE1C-80D2FE28 000098 000C+00 4/4 0/0 0/0 .data __vt__8cM3dGPla */ diff --git a/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.cpp b/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.cpp index c33ffc57990..461656a681c 100644 --- a/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.cpp +++ b/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_wchain -// +/** + * @file d_a_obj_wchain.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.h" #include "d/com/d_com_inf_game.h" @@ -244,25 +244,30 @@ COMPILER_STRIP_GATE(0x80D31964, &lit_3759); #pragma pop /* 80D319E4-80D31A04 -00001 0020+00 1/0 0/0 0/0 .data l_daObjWchain_Method */ -SECTION_DATA static void* l_daObjWchain_Method[8] = { - (void*)daObjWchain_Create__FP10fopAc_ac_c, - (void*)daObjWchain_Delete__FP13daObjWchain_c, - (void*)daObjWchain_Execute__FP13daObjWchain_c, - (void*)NULL, - (void*)daObjWchain_Draw__FP13daObjWchain_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjWchain_Method = { + (process_method_func)daObjWchain_Create__FP10fopAc_ac_c, + (process_method_func)daObjWchain_Delete__FP13daObjWchain_c, + (process_method_func)daObjWchain_Execute__FP13daObjWchain_c, + 0, + (process_method_func)daObjWchain_Draw__FP13daObjWchain_c, }; /* 80D31A04-80D31A34 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Wchain */ -SECTION_DATA extern void* g_profile_Obj_Wchain[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01590000, (void*)&g_fpcLf_Method, - (void*)0x000007BC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00F70000, (void*)&l_daObjWchain_Method, - (void*)0x00060100, (void*)0x030E0000, +extern actor_process_profile_definition g_profile_Obj_Wchain = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Wchain, // mProcName + &g_fpcLf_Method.mBase, // sub_method + 0x000007BC, // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 247, // mPriority + &l_daObjWchain_Method, // sub_method + 0x00060100, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D31A34-80D31A48 000050 0014+00 3/3 0/0 0/0 .data __vt__19daObjWchain_shape_c */ diff --git a/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick.cpp b/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick.cpp index 270a09b8d2d..29f01fea68c 100644 --- a/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick.cpp +++ b/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick.cpp @@ -1,235 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_wdStick -// +/** + * @file d_a_obj_wdStick.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80D31B88 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct Vec {}; -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266B84 */ void operator*(f32) const; -}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static u8 mGndCheck[84]; -}; - -struct daWdStick_c { - /* 80D31BD0 */ void setBaseMtx(); - /* 80D31C58 */ void CreateHeap(); - /* 80D31CC4 */ void create(); - /* 80D32168 */ void createHeapCallBack(fopAc_ac_c*); - /* 80D32194 */ void lightInit(); - /* 80D32198 */ void setLight(); - /* 80D3219C */ void setFire(); - /* 80D3269C */ void Execute(); - /* 80D32DB4 */ void bgCheck(); - /* 80D33348 */ void setBoundSe(); - /* 80D333F4 */ void mode_proc_call(); - /* 80D3350C */ void mode_init_wait(); - /* 80D3353C */ void mode_proc_wait(); - /* 80D33588 */ void mode_init_carry(); - /* 80D335AC */ void mode_proc_carry(); - /* 80D3386C */ void mode_init_drop(); - /* 80D33890 */ void mode_proc_drop(); - /* 80D338DC */ void mode_init_roll(); - /* 80D338F4 */ void mode_proc_roll(); - /* 80D33D44 */ void chkWaterLineIn(); - /* 80D33D68 */ void mode_init_sink(); - /* 80D33D8C */ void mode_proc_sink(); - /* 80D33EB0 */ void Draw(); - /* 80D33F14 */ void Delete(); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDSph[64]; -}; - -struct daWdStick_HIO_c { - /* 80D31B4C */ daWdStick_HIO_c(); - /* 80D34030 */ ~daWdStick_HIO_c(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); - - static u8 mParticleTracePCB[4 + 4 /* padding */]; -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcSph {}; - -struct dCcD_Sph { - /* 80084A34 */ void Set(dCcD_SrcSph const&); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80D3202C */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 80084548 */ void GetTgHitGObj(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjLinChk { - /* 80077F5C */ dBgS_ObjLinChk(); - /* 80077FB8 */ ~dBgS_ObjLinChk(); -}; - -struct dBgS_ObjGndChk { - /* 80D33CCC */ ~dBgS_ObjGndChk(); -}; - -struct dBgS_ObjAcch { - /* 80D320F8 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_LinChk { - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80D32088 */ ~dBgS_AcchCir(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct dBgS { - /* 80074E00 */ void GetWallCode(cBgS_PolyInfo const&); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGSph { - /* 8026F648 */ void SetC(cXyz const&); - /* 8026F708 */ void SetR(f32); - /* 80D31F9C */ ~cM3dGSph(); -}; - -struct cM3dGPla { - /* 80D32D6C */ ~cM3dGPla(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 80D31FE4 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80D33FE8 */ ~cCcD_GStts(); -}; - -struct cBgS_LinChk {}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 800744A0 */ void GroundCross(cBgS_GndChk*); - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -344,14 +121,6 @@ extern "C" void cLib_addCalc__FPfffff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); -extern "C" void PSVECScale(); -extern "C" void PSVECSquareMag(); -extern "C" void PSVECDotProduct(); -extern "C" void C_VECReflect(); extern "C" void __ptmf_scall(); extern "C" void __cvt_fp2unsigned(); extern "C" void _savegpr_25(); @@ -360,8 +129,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; @@ -370,9 +137,7 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" u8 mGndCheck__11fopAcM_gc_c[84]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -470,25 +235,30 @@ SECTION_DATA static u8 l_mode_func[60] = { #pragma pop /* 80D342F4-80D34314 -00001 0020+00 1/0 0/0 0/0 .data l_daWdStick_Method */ -SECTION_DATA static void* l_daWdStick_Method[8] = { - (void*)daWdStick_Create__FP10fopAc_ac_c, - (void*)daWdStick_Delete__FP11daWdStick_c, - (void*)daWdStick_Execute__FP11daWdStick_c, - (void*)NULL, - (void*)daWdStick_Draw__FP11daWdStick_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daWdStick_Method = { + (process_method_func)daWdStick_Create__FP10fopAc_ac_c, + (process_method_func)daWdStick_Delete__FP11daWdStick_c, + (process_method_func)daWdStick_Execute__FP11daWdStick_c, + 0, + (process_method_func)daWdStick_Draw__FP11daWdStick_c, }; /* 80D34314-80D34344 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_WdStick */ -SECTION_DATA extern void* g_profile_Obj_WdStick[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01650000, (void*)&g_fpcLf_Method, - (void*)0x00000AF8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01F10000, (void*)&l_daWdStick_Method, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_WdStick = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_WdStick, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daWdStick_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 497, // mPriority + &l_daWdStick_Method, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D34344-80D34374 000128 0030+00 2/2 0/0 0/0 .data __vt__14dBgS_ObjGndChk */ @@ -600,7 +370,8 @@ asm daWdStick_HIO_c::daWdStick_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick/__dt__14mDoHIO_entry_cFv.s" } @@ -681,7 +452,8 @@ asm void daWdStick_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { +// asm cM3dGSph::~cM3dGSph() { +extern "C" asm void __dt__8cM3dGSphFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick/__dt__8cM3dGSphFv.s" } @@ -691,7 +463,8 @@ asm cM3dGSph::~cM3dGSph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick/__dt__8cM3dGAabFv.s" } @@ -701,7 +474,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick/__dt__10dCcD_GSttsFv.s" } @@ -711,7 +485,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick/__dt__12dBgS_AcchCirFv.s" } @@ -721,7 +496,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick/__dt__12dBgS_ObjAcchFv.s" } @@ -901,7 +677,8 @@ static asm void bound(cXyz* param_0, cBgS_PolyInfo const& param_1, f32 param_2) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGPla::~cM3dGPla() { +// asm cM3dGPla::~cM3dGPla() { +extern "C" asm void __dt__8cM3dGPlaFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick/__dt__8cM3dGPlaFv.s" } @@ -1123,7 +900,8 @@ asm void daWdStick_c::mode_proc_roll() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +// asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +extern "C" asm void __dt__14dBgS_ObjGndChkFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick/__dt__14dBgS_ObjGndChkFv.s" } @@ -1266,7 +1044,8 @@ static asm void daWdStick_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_wood_pendulum/d_a_obj_wood_pendulum.cpp b/rel/d/a/obj/d_a_obj_wood_pendulum/d_a_obj_wood_pendulum.cpp index c8aa6633142..0f302bb2089 100644 --- a/rel/d/a/obj/d_a_obj_wood_pendulum/d_a_obj_wood_pendulum.cpp +++ b/rel/d/a/obj/d_a_obj_wood_pendulum/d_a_obj_wood_pendulum.cpp @@ -6,29 +6,6 @@ #include "rel/d/a/obj/d_a_obj_wood_pendulum/d_a_obj_wood_pendulum.h" #include "dol2asm.h" -class daObjWPndlm_c : public fopAc_ac_c { -public: - /* 80D39418 */ void initBaseMtx(); - /* 80D39454 */ void setBaseMtx(); - /* 80D394CC */ int Create(); - /* 80D395C8 */ int CreateHeap(); - /* 80D39638 */ int create(); - /* 80D39978 */ int execute(); - /* 80D39B68 */ int draw(); - /* 80D39BCC */ int _delete(); - - u32 getArg0() { return fopAcM_GetParamBit(this, 0, 8); } - u32 getArg1() { return fopAcM_GetParamBit(this, 8, 8); } - - /* 0x568 */ request_of_phase_process_class mPhaseReq; - /* 0x570 */ J3DModel* mpModel; - /* 0x574 */ dCcD_Stts mStts; - /* 0x5B0 */ dCcD_Sph mSph; - /* 0x6E8 */ dCcD_Sph field_0x6e8[2]; - /* 0x958 */ s16 field_0x958; - /* 0x95A */ s16 field_0x95a; - /* 0x95C */ s16 field_0x95c; -}; // Size: 0x960 // // Forward References: @@ -200,25 +177,30 @@ asm int daObjWPndlm_c::CreateHeap() { /* ############################################################################################## */ /* 80D39D48-80D39D68 -00001 0020+00 1/0 0/0 0/0 .data l_daObjWPndlm_Method */ -SECTION_DATA static void* l_daObjWPndlm_Method[8] = { - (void*)daObjWPndlm_Create__FP10fopAc_ac_c, - (void*)daObjWPndlm_Delete__FP13daObjWPndlm_c, - (void*)daObjWPndlm_Execute__FP13daObjWPndlm_c, - (void*)NULL, - (void*)daObjWPndlm_Draw__FP13daObjWPndlm_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjWPndlm_Method = { + (process_method_func)daObjWPndlm_Create__FP10fopAc_ac_c, + (process_method_func)daObjWPndlm_Delete__FP13daObjWPndlm_c, + (process_method_func)daObjWPndlm_Execute__FP13daObjWPndlm_c, + 0, + (process_method_func)daObjWPndlm_Draw__FP13daObjWPndlm_c, }; /* 80D39D68-80D39D98 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_WoodPendulum */ -SECTION_DATA extern void* g_profile_Obj_WoodPendulum[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01640000, (void*)&g_fpcLf_Method, - (void*)0x00000960, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00FD0000, (void*)&l_daObjWPndlm_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_WoodPendulum = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_WoodPendulum, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjWPndlm_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 253, // mPriority + &l_daObjWPndlm_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D39D98-80D39DA4 000054 000C+00 4/4 0/0 0/0 .data __vt__8cM3dGSph */ diff --git a/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue.cpp b/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue.cpp index b50ebb50b2e..320dc7eedfb 100644 --- a/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue.cpp +++ b/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue.cpp @@ -1,172 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_wood_statue -// +/** + * @file d_a_obj_wood_statue.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObjWStatue_c { - /* 80D3A268 */ void initBaseMtx(); - /* 80D3A2A4 */ void setBaseMtx(); - /* 80D3A2F0 */ void Create(); - /* 80D3A474 */ bool __CreateHeap(); - /* 80D3A47C */ void create(); - /* 80D3A8E8 */ void bg_check(); - /* 80D3AA3C */ void actionWaitInit(); - /* 80D3AA80 */ void actionWait(); - /* 80D3AB9C */ void initActionOrderGetDemo(); - /* 80D3AC64 */ void actionOrderGetDemo(); - /* 80D3ACAC */ void actionGetDemo(); - /* 80D3AD30 */ void actionInitSwOnWait(); - /* 80D3AD88 */ void actionSwOnWait(); - /* 80D3AE7C */ void actionInitBoomerangCarry(); - /* 80D3AF5C */ void actionBoomerangCarry(); - /* 80D3AFC0 */ void demoProc(); - /* 80D3B164 */ void effectSet(); - /* 80D3B250 */ void effectStop(); - /* 80D3B2A0 */ void execute(); - /* 80D3B428 */ void draw(); - /* 80D3B47C */ void setListStart(); - /* 80D3B480 */ void _delete(); -}; - -struct daItemBase_c { - /* 80037A64 */ void hide(); - /* 80037A74 */ void show(); - /* 80037ACC */ void chkDraw(); - /* 80144724 */ void DeleteBase(char const*); - /* 8014474C */ bool clothCreate(); - /* 80144B94 */ void DrawBase(); - /* 80144C30 */ void RotateYBase(); - /* 80144CC4 */ void settingBeforeDraw(); - /* 80144D18 */ void setTevStr(); - /* 80144D70 */ void setShadow(); - /* 80144EDC */ void animEntry(); - /* 8014503C */ void animPlay(f32, f32, f32, f32, f32, f32); - /* 80145144 */ void chkFlag(int); - /* 80145164 */ void getTevFrm(); - /* 80145180 */ void getBtpFrm(); - /* 8014519C */ void getShadowSize(); - /* 801451B4 */ void getCollisionH(); - /* 801451D0 */ void getCollisionR(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dPa_levelEcallBack { - /* 80D3A6F0 */ void cleanup(); - /* 80D3B580 */ ~dPa_levelEcallBack(); -}; - -struct dPa_followEcallBack { - /* 80049580 */ dPa_followEcallBack(u8, u8); - /* 80D3A66C */ ~dPa_followEcallBack(); - /* 80D3A6F4 */ void __defctor(); -}; - -struct dKy_tevstr_c {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dItem_data { - static void* field_item_res[1020]; - static u8 item_info[1020 + 4 /* padding */]; -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); - /* 80042518 */ void reset(void*); -}; - -struct dEvent_manager_c { - /* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8); - /* 80047A78 */ void endCheck(s16); - /* 80047ADC */ void endCheckOld(char const*); - /* 80047D4C */ void getIsAddvance(int); - /* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int); - /* 800480EC */ void getMySubstanceP(int, char const*, int); - /* 8004817C */ void cutEnd(int); - /* 800483C4 */ void setGoal(cXyz*); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80D3A878 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80D3A808 */ ~dBgS_AcchCir(); -}; - -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct cBgS { - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct JPABaseEmitter {}; - -struct JPAEmitterCallBack { - /* 8027E6A4 */ ~JPAEmitterCallBack(); - /* 80D3B5F4 */ void execute(JPABaseEmitter*); - /* 80D3B5F8 */ void executeAfter(JPABaseEmitter*); - /* 80D3B5FC */ void draw(JPABaseEmitter*); - /* 80D3B600 */ void drawAfter(JPABaseEmitter*); -}; // // Forward References: @@ -303,15 +143,12 @@ extern "C" void SetR__8cM3dGCylFf(); extern "C" void __dt__18JPAEmitterCallBackFv(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); extern "C" void __construct_array(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__19dPa_followEcallBack[10]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -491,25 +328,30 @@ SECTION_DATA static u8 l_demoFunc[60] = { #pragma pop /* 80D3B7CC-80D3B7EC -00001 0020+00 1/0 0/0 0/0 .data l_daObjWStatue_Method */ -SECTION_DATA static void* l_daObjWStatue_Method[8] = { - (void*)daObjWStatue_Create__FP10fopAc_ac_c, - (void*)daObjWStatue_Delete__FP14daObjWStatue_c, - (void*)daObjWStatue_Execute__FP14daObjWStatue_c, - (void*)NULL, - (void*)daObjWStatue_Draw__FP14daObjWStatue_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjWStatue_Method = { + (process_method_func)daObjWStatue_Create__FP10fopAc_ac_c, + (process_method_func)daObjWStatue_Delete__FP14daObjWStatue_c, + (process_method_func)daObjWStatue_Execute__FP14daObjWStatue_c, + 0, + (process_method_func)daObjWStatue_Draw__FP14daObjWStatue_c, }; /* 80D3B7EC-80D3B81C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_WoodStatue */ -SECTION_DATA extern void* g_profile_Obj_WoodStatue[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01850000, (void*)&g_fpcLf_Method, - (void*)0x00000974, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02330000, (void*)&l_daObjWStatue_Method, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_WoodStatue = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_WoodStatue, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjWStatue_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 563, // mPriority + &l_daObjWStatue_Method, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D3B81C-80D3B828 000100 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ @@ -727,14 +569,16 @@ asm void daObjWStatue_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dPa_followEcallBack::~dPa_followEcallBack() { +// asm dPa_followEcallBack::~dPa_followEcallBack() { +extern "C" asm void __dt__19dPa_followEcallBackFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue/__dt__19dPa_followEcallBackFv.s" } #pragma pop /* 80D3A6F0-80D3A6F4 000930 0004+00 1/0 0/0 0/0 .text cleanup__18dPa_levelEcallBackFv */ -void dPa_levelEcallBack::cleanup() { +// void dPa_levelEcallBack::cleanup() { +extern "C" asm void cleanup__18dPa_levelEcallBackFv() { /* empty function */ } @@ -743,7 +587,8 @@ void dPa_levelEcallBack::cleanup() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dPa_followEcallBack::__defctor() { +// asm void dPa_followEcallBack::__defctor() { +extern "C" asm void __defctor__19dPa_followEcallBackFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue/__defctor__19dPa_followEcallBackFv.s" } @@ -786,7 +631,8 @@ extern "C" asm void __dt__10dCcD_GSttsFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue/__dt__12dBgS_AcchCirFv.s" } @@ -796,7 +642,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue/__dt__12dBgS_ObjAcchFv.s" } @@ -1109,7 +956,8 @@ extern "C" asm void __dt__10cCcD_GSttsFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dPa_levelEcallBack::~dPa_levelEcallBack() { +// asm dPa_levelEcallBack::~dPa_levelEcallBack() { +extern "C" asm void __dt__18dPa_levelEcallBackFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue/__dt__18dPa_levelEcallBackFv.s" } @@ -1117,25 +965,29 @@ asm dPa_levelEcallBack::~dPa_levelEcallBack() { /* 80D3B5F4-80D3B5F8 001834 0004+00 1/0 0/0 0/0 .text * execute__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::execute(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::execute(JPABaseEmitter* param_0) { +extern "C" asm void execute__18JPAEmitterCallBackFP14JPABaseEmitter() { /* empty function */ } /* 80D3B5F8-80D3B5FC 001838 0004+00 1/0 0/0 0/0 .text * executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::executeAfter(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::executeAfter(JPABaseEmitter* param_0) { +extern "C" asm void executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter() { /* empty function */ } /* 80D3B5FC-80D3B600 00183C 0004+00 1/0 0/0 0/0 .text draw__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::draw(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::draw(JPABaseEmitter* param_0) { +extern "C" asm void draw__18JPAEmitterCallBackFP14JPABaseEmitter() { /* empty function */ } /* 80D3B600-80D3B604 001840 0004+00 1/0 0/0 0/0 .text * drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::drawAfter(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::drawAfter(JPABaseEmitter* param_0) { +extern "C" asm void drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter() { /* empty function */ } diff --git a/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag.cpp b/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag.cpp index 2a3d5b46150..2f422e736ed 100644 --- a/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag.cpp +++ b/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag.cpp @@ -1,207 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_yel_bag -// +/** + * @file d_a_obj_yel_bag.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266F48 */ void normalizeZP(); - /* 80D3C35C */ ~cXyz(); -}; - -struct mDoMtx_stack_c { - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObj_YBag_c { - /* 80D3C0EC */ daObj_YBag_c(); - /* 80D3C408 */ ~daObj_YBag_c(); - /* 80D3C610 */ void create(); - /* 80D3C898 */ void CreateHeap(); - /* 80D3C93C */ void Delete(); - /* 80D3C970 */ void Execute(); - /* 80D3D32C */ void Draw(); - /* 80D3D438 */ void createHeapCallBack(fopAc_ac_c*); - /* 80D3D458 */ bool getTypeFromParam(); - /* 80D3D460 */ bool isDelete(); - /* 80D3D468 */ void setEnvTevColor(); - /* 80D3D4C4 */ void setRoomNo(); - /* 80D3D508 */ void reset(); - /* 80D3D5C8 */ void setMtx(); - /* 80D3D69C */ void calcRollAngle(s16, int); - /* 80D3D73C */ void getWallAngle(s16, s16*); - /* 80D3D8CC */ void setSmokePrtcl(); - /* 80D3D948 */ void setWaterPrtcl(); - /* 80D3DA70 */ void setHamonPrtcl(); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; -}; - -struct daObj_YBag_Param_c { - /* 80D3DC20 */ ~daObj_YBag_Param_c(); - - static u8 const m[44]; -}; - -struct daNpcT_c { - static u8 const mCcDObjData[48]; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B8B4 */ void forceOnEventMove(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80D3C300 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80D3C398 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F40 */ void SetWallR(f32); - /* 80075F58 */ void SetWall(f32, f32); - /* 80D3C290 */ ~dBgS_AcchCir(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct dBgS { - /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80D3C200 */ ~cM3dGCyl(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 80D3C248 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80D3DB48 */ ~cCcD_GStts(); -}; - -struct cBgS_LinChk {}; -struct cBgS_GndChk { - /* 80267C1C */ cBgS_GndChk(); - /* 80267C94 */ ~cBgS_GndChk(); -}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); -}; - -struct _GXTexObj {}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; // // Forward References: @@ -319,10 +124,6 @@ extern "C" void cLib_addCalcAngleS2__FPssss(); extern "C" void cLib_chaseF__FPfff(); extern "C" void cLib_chaseAngleS__FPsss(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); extern "C" void _savegpr_23(); extern "C" void _savegpr_25(); extern "C" void _savegpr_26(); @@ -333,10 +134,7 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); -extern "C" void abs(); extern "C" u8 const mCcDObjData__8daNpcT_c[48]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CylAttr[25]; @@ -345,9 +143,7 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; extern "C" void __register_global_object(); // @@ -413,25 +209,30 @@ SECTION_DATA static u8 emttrId[8] = { }; /* 80D3DE00-80D3DE20 -00001 0020+00 1/0 0/0 0/0 .data daObj_YBag_MethodTable */ -SECTION_DATA static void* daObj_YBag_MethodTable[8] = { - (void*)daObj_YBag_Create__FPv, - (void*)daObj_YBag_Delete__FPv, - (void*)daObj_YBag_Execute__FPv, - (void*)daObj_YBag_IsDelete__FPv, - (void*)daObj_YBag_Draw__FPv, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObj_YBag_MethodTable = { + (process_method_func)daObj_YBag_Create__FPv, + (process_method_func)daObj_YBag_Delete__FPv, + (process_method_func)daObj_YBag_Execute__FPv, + (process_method_func)daObj_YBag_IsDelete__FPv, + (process_method_func)daObj_YBag_Draw__FPv, }; /* 80D3DE20-80D3DE50 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_YBAG */ -SECTION_DATA extern void* g_profile_OBJ_YBAG[12] = { - (void*)0xFFFFFFFD, (void*)0x0008FFFD, - (void*)0x02F70000, (void*)&g_fpcLf_Method, - (void*)0x00000A3C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02CB0000, (void*)&daObj_YBag_MethodTable, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_YBAG = { + fpcLy_CURRENT_e, // mLayerID + 8, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_YBAG, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObj_YBag_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 715, // mPriority + &daObj_YBag_MethodTable, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D3DE50-80D3DE5C 0000DC 000C+00 2/2 0/0 0/0 .data __vt__12daObj_YBag_c */ @@ -503,7 +304,8 @@ asm daObj_YBag_c::daObj_YBag_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag/__dt__8cM3dGCylFv.s" } @@ -513,7 +315,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag/__dt__8cM3dGAabFv.s" } @@ -523,7 +326,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag/__dt__12dBgS_AcchCirFv.s" } @@ -533,7 +337,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag/__dt__10dCcD_GSttsFv.s" } @@ -543,7 +348,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag/__dt__4cXyzFv.s" } @@ -553,7 +359,8 @@ asm cXyz::~cXyz() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag/__dt__12dBgS_ObjAcchFv.s" } @@ -1130,7 +937,8 @@ static bool daObj_YBag_IsDelete(void* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.cpp b/rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.cpp index 340e05c98e7..386b9fb2069 100644 --- a/rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.cpp +++ b/rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.cpp @@ -1,199 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_yousei -// +/** + * @file d_a_obj_yousei.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.h" #include "d/cc/d_cc_d.h" #include "dol2asm.h" -// -// Types: -// - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; - -struct mDoExt_McaMorfSO { - /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, - int, Z2Creature*, u32, u32); - /* 800110B0 */ void play(u32, s8); - /* 800111C0 */ void entryDL(); - /* 800111EC */ void modelCalc(); - /* 80011310 */ void stopZelAnime(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daPy_py_c { - /* 804D15CC */ void getHeadTopPos() const; -}; - -struct daPy_boomerangMove_c { - /* 8015E5B0 */ void initOffset(cXyz const*); - /* 8015E654 */ void posMove(cXyz*, s16*, fopAc_ac_c*, s16); - /* 8015E87C */ void bgCheckAfterOffset(cXyz const*); -}; - -struct daObjYOUSEI_c { - /* 804CE738 */ void InitCcSph(); - /* 804CE7A4 */ void SetCcSph(); - /* 804CE920 */ void SpeedSet(); - /* 804CE9D0 */ void MoveAction(); - /* 804CEE50 */ void BinAction(); - /* 804CF098 */ void LinkChk(); - /* 804CF6C4 */ void WaitAction(); - /* 804CFCE8 */ void LinkAction(); - /* 804D057C */ void LinkSearch(); - /* 804D065C */ void WayBgCheck(f32, f32, s16); - /* 804D0780 */ void CareAction(); - /* 804D080C */ void CheckGround(); - /* 804D0988 */ void CheckWater(); - /* 804D0AD0 */ void Action(); - /* 804D0CCC */ void ObjHit(); - /* 804D0DF0 */ void Execute(); - /* 804D0F98 */ void Delete(); - /* 804D0FCC */ void setBaseMtx(); - /* 804D111C */ void create(); -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B8B4 */ void forceOnEventMove(u32); - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjGndChk_All { - /* 800778E8 */ ~dBgS_ObjGndChk_All(); -}; - -struct dBgS_ObjGndChk { - /* 804D0910 */ ~dBgS_ObjGndChk(); -}; - -struct dBgS_ObjAcch { - /* 804D152C */ ~dBgS_ObjAcch(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); -}; - -struct cBgS_PolyInfo {}; - -struct dBgS { - /* 80074E50 */ void GetPolyAtt0(cBgS_PolyInfo const&); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); - /* 800773A4 */ void ClrMoveBGOnly(); -}; - -struct dAttCatch_c { - /* 80073A08 */ void request(fopAc_ac_c*, u8, f32, f32, f32, s16, int); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_LinChk {}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 800744A0 */ void GroundCross(cBgS_GndChk*); -}; - -struct _GXTexObj {}; - -struct JPABaseEmitter { - /* 8027EC60 */ void deleteAllParticle(); -}; - -struct J3DFrameCtrl { - /* 8032842C */ void checkPass(f32); -}; // // Forward References: @@ -319,8 +132,6 @@ extern "C" void init__10Z2CreatureFP3VecP3VecUcUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void checkPass__12J3DFrameCtrlFf(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void __cvt_fp2unsigned(); extern "C" void _savegpr_25(); extern "C" void _savegpr_28(); @@ -328,8 +139,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_25(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" extern void* __vt__18dBgS_ObjGndChk_All[12]; extern "C" extern void* __vt__8dCcD_Sph[36]; @@ -340,7 +149,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; // @@ -982,25 +790,30 @@ SECTION_RODATA static f32 const lit_4482 = -1000000000.0f; COMPILER_STRIP_GATE(0x804D1714, &lit_4482); /* 804D1728-804D1748 -00001 0020+00 1/0 0/0 0/0 .data l_daObjYOUSEI_Method */ -SECTION_DATA static void* l_daObjYOUSEI_Method[8] = { - (void*)daObjYOUSEI_Create__FP10fopAc_ac_c, - (void*)daObjYOUSEI_Delete__FP13daObjYOUSEI_c, - (void*)daObjYOUSEI_Execute__FP13daObjYOUSEI_c, - (void*)daObjYOUSEI_IsDelete__FP13daObjYOUSEI_c, - (void*)daObjYOUSEI_Draw__FP13daObjYOUSEI_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjYOUSEI_Method = { + (process_method_func)daObjYOUSEI_Create__FP10fopAc_ac_c, + (process_method_func)daObjYOUSEI_Delete__FP13daObjYOUSEI_c, + (process_method_func)daObjYOUSEI_Execute__FP13daObjYOUSEI_c, + (process_method_func)daObjYOUSEI_IsDelete__FP13daObjYOUSEI_c, + (process_method_func)daObjYOUSEI_Draw__FP13daObjYOUSEI_c, }; /* 804D1748-804D1778 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Yousei */ -SECTION_DATA extern void* g_profile_Obj_Yousei[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x013F0000, (void*)&g_fpcLf_Method, - (void*)0x00000A4C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01DB0000, (void*)&l_daObjYOUSEI_Method, - (void*)0x000C0100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Yousei = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Yousei, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjYOUSEI_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 475, // mPriority + &l_daObjYOUSEI_Method, // sub_method + 0x000C0100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 804D1778-804D1784 000050 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGSph */ @@ -1060,7 +873,8 @@ asm void daObjYOUSEI_c::CheckGround() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +// asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +extern "C" asm void __dt__14dBgS_ObjGndChkFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei/__dt__14dBgS_ObjGndChkFv.s" } @@ -1199,7 +1013,8 @@ extern "C" asm void __dt__8cM3dGAabFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei/__dt__12dBgS_ObjAcchFv.s" } @@ -1264,7 +1079,8 @@ static asm void func_804D15C4() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::getHeadTopPos() const { +// asm void daPy_py_c::getHeadTopPos() const { +extern "C" asm void getHeadTopPos__9daPy_py_cCFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei/getHeadTopPos__9daPy_py_cCFv.s" } diff --git a/rel/d/a/obj/d_a_obj_zdoor/d_a_obj_zdoor.cpp b/rel/d/a/obj/d_a_obj_zdoor/d_a_obj_zdoor.cpp index 196b4b824f6..b6abe0831c1 100644 --- a/rel/d/a/obj/d_a_obj_zdoor/d_a_obj_zdoor.cpp +++ b/rel/d/a/obj/d_a_obj_zdoor/d_a_obj_zdoor.cpp @@ -6,31 +6,6 @@ #include "rel/d/a/obj/d_a_obj_zdoor/d_a_obj_zdoor.h" #include "dol2asm.h" -class daZdoor_c : public dBgS_MoveBgActor { -public: - /* 80D3F65C */ void init_cyl(); - /* 80D3F740 */ void set_cyl(); - /* 80D3F884 */ void setBaseMtx(); - /* 80D3F8F8 */ int Create(); - /* 80D3F970 */ int CreateHeap(); - /* 80D3F9F0 */ int create1st(); - /* 80D3FACC */ int Execute(Mtx**); - /* 80D3FCE8 */ int Draw(); - /* 80D3FD8C */ int Delete(); - - u32 getType() { return fopAcM_GetParamBit(this, 0, 4); } - - /* 0x5A0 */ request_of_phase_process_class mPhaseReq; - /* 0x5A8 */ J3DModel* mpModel; - /* 0x5AC */ dBgS_ObjAcch mObjAcch; - /* 0x784 */ dBgS_AcchCir mAcchCir; - /* 0x7C4 */ dCcD_Stts mStts; - /* 0x800 */ dCcD_Cyl field_0x800[4]; - /* 0xCF0 */ dCcD_Cyl field_0xcf0; - /* 0xE2C */ s16 field_0xe2c; - /* 0xE2E */ s16 field_0xe2e; - /* 0xE30 */ u8 field_0xe30; -}; // Size: 0xE34 // // Forward References: @@ -455,25 +430,30 @@ asm int daZdoor_c::Delete() { /* ############################################################################################## */ /* 80D403BC-80D403DC -00001 0020+00 1/0 0/0 0/0 .data daZdoor_METHODS */ -SECTION_DATA static void* daZdoor_METHODS[8] = { - (void*)daZdoor_create1st__FP9daZdoor_c, - (void*)daZdoor_MoveBGDelete__FP9daZdoor_c, - (void*)daZdoor_MoveBGExecute__FP9daZdoor_c, - (void*)NULL, - (void*)daZdoor_MoveBGDraw__FP9daZdoor_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daZdoor_METHODS = { + (process_method_func)daZdoor_create1st__FP9daZdoor_c, + (process_method_func)daZdoor_MoveBGDelete__FP9daZdoor_c, + (process_method_func)daZdoor_MoveBGExecute__FP9daZdoor_c, + 0, + (process_method_func)daZdoor_MoveBGDraw__FP9daZdoor_c, }; /* 80D403DC-80D4040C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_ZDoor */ -SECTION_DATA extern void* g_profile_Obj_ZDoor[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00320000, (void*)&g_fpcLf_Method, - (void*)0x00000E34, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00180000, (void*)&daZdoor_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_ZDoor = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_ZDoor, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daZdoor_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 24, // mPriority + &daZdoor_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D4040C-80D40418 0000FC 000C+00 4/4 0/0 0/0 .data __vt__8cM3dGCyl */ diff --git a/rel/d/a/obj/d_a_obj_zraMark/d_a_obj_zraMark.cpp b/rel/d/a/obj/d_a_obj_zraMark/d_a_obj_zraMark.cpp index 73e5f820578..0d6b82460fb 100644 --- a/rel/d/a/obj/d_a_obj_zraMark/d_a_obj_zraMark.cpp +++ b/rel/d/a/obj/d_a_obj_zraMark/d_a_obj_zraMark.cpp @@ -1,84 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_zraMark -// +/** + * @file d_a_obj_zraMark.cpp + * +*/ #include "rel/d/a/obj/d_a_obj_zraMark/d_a_obj_zraMark.h" #include "dol2asm.h" -// -// Types: -// - -struct daNpcF_ActorMngr_c { - /* 801506B0 */ void initialize(); - /* 801506BC */ void entry(fopAc_ac_c*); - /* 801506EC */ void getActorP(); - /* 80D43C6C */ ~daNpcF_ActorMngr_c(); - /* 80D43CB4 */ daNpcF_ActorMngr_c(); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 800844F8 */ void GetTgHitObj(); - /* 8008457C */ void GetTgHitObjSe(); - /* 800845B0 */ void getHitSeID(u8, int); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80D43CF0 */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80D43D38 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct _ZraMark_Hahen_c { - /* 80D4347C */ void create(cXyz const&, s8, s8, s8, s8); - /* 80D434F8 */ void loadModel(); - /* 80D4357C */ void init(cXyz const&, s8, s8, s8); - /* 80D43808 */ void calcSpeed(); - /* 80D43864 */ void setMtx(); - /* 80D438C8 */ void draw(); - /* 80D43B48 */ ~_ZraMark_Hahen_c(); - /* 80D43BB4 */ _ZraMark_Hahen_c(); -}; - -struct _ZraMark_Hahen_Mng_c { - /* 80D43968 */ void create(cXyz const&, s8, s8, s8, s8); - /* 80D439F8 */ void calc(); - /* 80D43A74 */ void draw(); -}; // // Forward References: @@ -282,25 +210,30 @@ SECTION_DATA static u8 data_80D43FA0[4] = { SECTION_DATA static void* l_arcName = (void*)&d_a_obj_zraMark__stringBase0; /* 80D43FA8-80D43FC8 -00001 0020+00 1/0 0/0 0/0 .data l_daObjZraMark_Method */ -SECTION_DATA static void* l_daObjZraMark_Method[8] = { - (void*)daObjZraMark_create__FP10fopAc_ac_c, - (void*)daObjZraMark_Delete__FP14daObjZraMark_c, - (void*)daObjZraMark_Execute__FP14daObjZraMark_c, - (void*)daObjZraMark_IsDelete__FP14daObjZraMark_c, - (void*)daObjZraMark_Draw__FP14daObjZraMark_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjZraMark_Method = { + (process_method_func)daObjZraMark_create__FP10fopAc_ac_c, + (process_method_func)daObjZraMark_Delete__FP14daObjZraMark_c, + (process_method_func)daObjZraMark_Execute__FP14daObjZraMark_c, + (process_method_func)daObjZraMark_IsDelete__FP14daObjZraMark_c, + (process_method_func)daObjZraMark_Draw__FP14daObjZraMark_c, }; /* 80D43FC8-80D43FF8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_ZRA_MARK */ -SECTION_DATA extern void* g_profile_ZRA_MARK[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02850000, (void*)&g_fpcLf_Method, - (void*)0x00003E40, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01880000, (void*)&l_daObjZraMark_Method, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_ZRA_MARK = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_ZRA_MARK, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjZraMark_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 392, // mPriority + &l_daObjZraMark_Method, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D43FF8-80D44004 000058 000C+00 2/2 0/0 0/0 .data __vt__18daNpcF_ActorMngr_c */ @@ -801,7 +734,8 @@ extern "C" asm void __ct__11J3DLightObjFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daNpcF_ActorMngr_c::~daNpcF_ActorMngr_c() { +// asm daNpcF_ActorMngr_c::~daNpcF_ActorMngr_c() { +extern "C" asm void __dt__18daNpcF_ActorMngr_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_zraMark/d_a_obj_zraMark/__dt__18daNpcF_ActorMngr_cFv.s" } @@ -811,7 +745,8 @@ asm daNpcF_ActorMngr_c::~daNpcF_ActorMngr_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daNpcF_ActorMngr_c::daNpcF_ActorMngr_c() { +// asm daNpcF_ActorMngr_c::daNpcF_ActorMngr_c() { +extern "C" asm void __ct__18daNpcF_ActorMngr_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_zraMark/d_a_obj_zraMark/__ct__18daNpcF_ActorMngr_cFv.s" } @@ -821,7 +756,8 @@ asm daNpcF_ActorMngr_c::daNpcF_ActorMngr_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_zraMark/d_a_obj_zraMark/__dt__8cM3dGCylFv.s" } @@ -831,7 +767,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_zraMark/d_a_obj_zraMark/__dt__8cM3dGAabFv.s" } diff --git a/rel/d/a/tag/d_a_tag_attack_item/d_a_tag_attack_item.cpp b/rel/d/a/tag/d_a_tag_attack_item/d_a_tag_attack_item.cpp index 7237159f323..3fe38891589 100644 --- a/rel/d/a/tag/d_a_tag_attack_item/d_a_tag_attack_item.cpp +++ b/rel/d/a/tag/d_a_tag_attack_item/d_a_tag_attack_item.cpp @@ -414,7 +414,7 @@ extern "C" bool eventRun__17dEvLib_callback_cFv() { /* 805A30F0-805A30F8 000810 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv */ -// bool dEvLib_callback_c::eventStart() { +// bool dEvLib_callback_c::eventStart()() { extern "C" bool eventStart__17dEvLib_callback_cFv() { return true; } diff --git a/tools/add_class_comments.py b/tools/add_class_comments.py new file mode 100644 index 00000000000..d244948495b --- /dev/null +++ b/tools/add_class_comments.py @@ -0,0 +1,51 @@ +import click +import os +import re +import sys + +@click.command() +@click.option('--path', required=True, help='Path to the header file or directory.') +def modify_headers(path): + if os.path.isfile(path): + process_file(path) + elif os.path.isdir(path): + for root, _, files in os.walk(path): + for file in files: + if file.endswith('.h'): + file_path = os.path.join(root, file) + process_file(file_path) + else: + sys.exit(f'Error: Path {path} is neither a file nor a directory.') + +def process_file(file_path): + try: + with open(file_path, 'r') as file: + lines = file.readlines() + + class_decl_pattern = re.compile(r'class\s+(\w+)\s*:') + doxygen_comment_pattern = re.compile(r'/\*\*\s+@ingroup actors-objects\s+@class\s+\w+\s+@brief', re.MULTILINE) + + for i, line in enumerate(lines): + match = class_decl_pattern.search(line) + if match: + class_name = match.group(1) + # Check if Doxygen comment is missing + if not doxygen_comment_pattern.search(''.join(lines[max(0, i-3):i])): + doxygen_comment = f"""/**\n * @ingroup actors-objects\n * @class {class_name}\n * @brief\n *\n * @details\n *\n */\n""" + lines.insert(i, doxygen_comment) + + # Stop after processing the first class declaration + break + + with open(file_path, 'w') as file: + file.writelines(lines) + + print(f'Processed {file_path} successfully.') + + except FileNotFoundError: + sys.exit(f'Error: File {file_path} not found.') + except Exception as e: + sys.exit(f'Error processing file {file_path}: {e}') + +if __name__ == '__main__': + modify_headers() diff --git a/tools/setup_actor.py b/tools/setup_actor.py index cae8fbf990b..6c9fcb444bf 100644 --- a/tools/setup_actor.py +++ b/tools/setup_actor.py @@ -70,7 +70,52 @@ "asm dBgS_ObjAcch::dBgS_ObjAcch()": "__ct__12dBgS_ObjAcchFv", "asm void daTag_FWall_c::getPos(u8 param_0)": "getPos__13daTag_FWall_cFUc", "asm void daB_DS_c::getHandPosR()": "getHandPosR__8daB_DS_cFv", - "asm void daB_DS_c::getHandPosL()": "getHandPosL__8daB_DS_cFv" + "asm void daB_DS_c::getHandPosL()": "getHandPosL__8daB_DS_cFv", + "asm dEvLib_callback_c::~dEvLib_callback_c()": "__dt__17dEvLib_callback_cFv", + "bool dEvLib_callback_c::eventStart()": "eventStart__17dEvLib_callback_cFv", + "asm void dInsect_c::Insect_Release()": "Insect_Release__9dInsect_cFv", + "asm dBgS_WtrChk::~dBgS_WtrChk()": "__dt__11dBgS_WtrChkFv", + "asm dBgS_ObjGndChk::dBgS_ObjGndChk()": "__ct__14dBgS_ObjGndChkFv", + "asm void daObjLife_c::setPos(cXyz param_0)": "setPos__11daObjLife_cF4cXyz", + "asm void daPy_py_c::getRightHandPos() const": "getRightHandPos__9daPy_py_cCFv", + "asm daBaseNpc_path_c::~daBaseNpc_path_c()": "__dt__16daBaseNpc_path_cFv", + "asm daBaseNpc_acMngr_c::~daBaseNpc_acMngr_c()": "__dt__18daBaseNpc_acMngr_cFv", + "asm daBaseNpc_moveBgActor_c::~daBaseNpc_moveBgActor_c()": "__dt__23daBaseNpc_moveBgActor_cFv", + "asm void dAttention_c::getDistTable(int param_0)": "getDistTable__12dAttention_cFi", + "asm dMdl_obj_c::dMdl_obj_c()": "__ct__10dMdl_obj_cFv", + "asm cM3dGLin::~cM3dGLin()": "__dt__8cM3dGLinFv", + "asm dCcD_Cps::~dCcD_Cps()": "__dt__8dCcD_CpsFv", + "asm dCcD_Cps::dCcD_Cps()": "__ct__8dCcD_CpsFv", + "asm daNpcT_Path_c::~daNpcT_Path_c()" : "__dt__13daNpcT_Path_cFv", + "asm daNpcT_ActorMngr_c::daNpcT_ActorMngr_c()": "__ct__18daNpcT_ActorMngr_cFv", + "asm void daNpcT_JntAnm_c::setEyeAngleY(cXyz param_0, s16 param_1, int param_2, f32 param_3, s16 param_4)": "setEyeAngleY__15daNpcT_JntAnm_cF4cXyzsifs", + "asm void daNpcT_JntAnm_c::setEyeAngleX(cXyz param_0, f32 param_1, s16 param_2)": "setEyeAngleX__15daNpcT_JntAnm_cF4cXyzfs", + "asm void daNpcT_c::getFaceMotionAnm(daNpcT_faceMotionAnmData_c param_0)": "getFaceMotionAnm__8daNpcT_cF26daNpcT_faceMotionAnmData_c", + "asm void daNpcT_c::getMotionAnm(daNpcT_motionAnmData_c param_0)": "getMotionAnm__8daNpcT_cF22daNpcT_motionAnmData_c", + "asm void daTag_EvtArea_c::chkPointInArea(cXyz param_0)": "chkPointInArea__15daTag_EvtArea_cF4cXyz", + "asm void daPy_py_c::getLeftHandPos() const" : "getLeftHandPos__9daPy_py_cCFv", + "asm mDoExt_bckAnm::~mDoExt_bckAnm()": "__dt__13mDoExt_bckAnmFv", + "asm mDoExt_bckAnm::mDoExt_bckAnm()": "__ct__13mDoExt_bckAnmFv", + "asm cM3dGTri::~cM3dGTri()": "__dt__8cM3dGTriFv", + # "asm cM3dGTri::cM3dGTri()": "" + "asm J3DTevKColorAnm::~J3DTevKColorAnm()": "__dt__15J3DTevKColorAnmFv", + "asm J3DTevKColorAnm::J3DTevKColorAnm()": "__ct__15J3DTevKColorAnmFv", + "asm J3DTevColorAnm::~J3DTevColorAnm()": "__dt__14J3DTevColorAnmFv", + "asm J3DTevColorAnm::J3DTevColorAnm()": "__ct__14J3DTevColorAnmFv", + "asm J3DTexNoAnm::~J3DTexNoAnm()": "__dt__11J3DTexNoAnmFv", + "asm J3DTexNoAnm::J3DTexNoAnm()": "__ct__11J3DTexNoAnmFv", + "asm J3DTexMtxAnm::~J3DTexMtxAnm()": "__dt__12J3DTexMtxAnmFv", + "asm J3DTexMtxAnm::J3DTexMtxAnm()": "__ct__12J3DTexMtxAnmFv", + "asm J3DMatColorAnm::~J3DMatColorAnm()": "__dt__14J3DMatColorAnmFv", + "asm J3DMatColorAnm::J3DMatColorAnm()": "__ct__14J3DMatColorAnmFv", + "asm void J3DTexNoAnm::calc(u16* param_0) const": "calc__11J3DTexNoAnmCFPUs", + "asm daNpcF_Lookat_c::~daNpcF_Lookat_c()": "__dt__15daNpcF_Lookat_cFv", + "asm daNpcF_c::~daNpcF_c()": "__dt__8daNpcF_cFv", + "asm daNpcF_ActorMngr_c::~daNpcF_ActorMngr_c()": "__dt__18daNpcF_ActorMngr_cFv", + "asm daNpcF_c::daNpcF_c()": "__ct__8daNpcF_cFv", + "asm daNpcF_ActorMngr_c::daNpcF_ActorMngr_c()": "__ct__18daNpcF_ActorMngr_cFv", + "void daNpcF_c::adjustShapeAngle()": "adjustShapeAngle__8daNpcF_cFv", + "void daNpcF_c::setCollisions()": "setCollisions__8daNpcF_cFv" } # list of known external references to be replaced to avoid symbol collision @@ -97,10 +142,60 @@ "extern \"C\" extern u8 g_dComIfG_gameInfo[122384];", "extern \"C\" void PSMTXScale();", "extern \"C\" void PSMTXInverse();", - "extern \"C\" extern u8 mStayNo__20dStage_roomControl_c[4];" + "SECTION_INIT void memset();", + "extern \"C\" void OSReport();" + # "extern \"C\" extern u8 mStayNo__20dStage_roomControl_c[4];" + "extern \"C\" void GXLoadLightObjImm();", + "extern \"C\" void GXSetChanAmbColor();", + "extern \"C\" void GXSetChanMatColor();", + "extern \"C\" void GXLoadPosMtxImm();", + "extern \"C\" void GXLoadNrmMtxImm();", + "extern \"C\" void GXLoadLightObjImm();", + "extern \"C\" void PSMTXConcat();", + "extern \"C\" void GXSetVtxDesc();", + "extern \"C\" void GXSetVtxAttrFmt();", + "extern \"C\" void GXSetArray();", + "extern \"C\" void GXSetTexCoordGen2();", + "extern \"C\" void GXSetNumTexGens();", + "extern \"C\" void GXSetCullMode();", + "extern \"C\" void GXSetNumChans();", + "extern \"C\" void GXSetChanCtrl();", + "extern \"C\" void GXInitTexObj();", + "extern \"C\" void GXInitTexObjLOD();", + "extern \"C\" void GXLoadTexObj();", + "extern \"C\" void GXSetNumIndStages();", + "extern \"C\" void GXSetTevColorIn();", + "extern \"C\" void GXSetTevAlphaIn();", + "extern \"C\" void GXSetTevColorOp();", + "extern \"C\" void GXSetTevAlphaOp();", + "extern \"C\" void GXSetTevColor();", + "extern \"C\" void GXSetTevKColor();", + "extern \"C\" void GXSetTevKColorSel();", + "extern \"C\" void GXSetTevKAlphaSel();", + "extern \"C\" void GXSetTevSwapMode();", + "extern \"C\" void GXSetAlphaCompare();", + "extern \"C\" void GXSetTevOrder();", + "extern \"C\" void GXSetNumTevStages();", + "extern \"C\" void GXClearVtxDesc();", + "extern \"C\" void GXSetZMode();", + "extern \"C\" void GXSetZCompLoc();", + "extern \"C\" void GXCallDisplayList();", + "extern \"C\" void GXSetClipMode();", + "extern \"C\" void DCStoreRangeNoSync();", + "extern \"C\" void PSVECDotProduct();", + "extern \"C\" void GXBegin();", + "extern \"C\" void C_VECReflect();", + "extern \"C\" void strcpy();", + "extern \"C\" extern u32 __float_max;", + "extern \"C\" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */];", + "extern \"C\" void C_MTXLightPerspective();", + "extern \"C\" extern u8 const j3dDefaultMtx[48];", + "extern \"C\" void PSMTXIdentity();", + "extern \"C\" void PSMTXRotAxisRad();", + "extern \"C\" void C_MTXLightOrtho();", + "extern \"C\" void strcat();", ] -# list of known types to be removed types = [ "struct request_of_phase_process_class", "struct mDoMtx_stack_c", @@ -192,7 +287,7 @@ "struct cSAngle", "struct mDoExt_invisibleModel", "struct dCcD_GAtTgCoCommonBase", - "struct daObjHHASHI_c", + # "struct daObjHHASHI_c", "struct dSv_event_flag_c", "struct dSv_event_c", "struct LIGHT_INFLUENCE", @@ -229,17 +324,94 @@ "struct dEvt_info_c", "struct dAttList_c", "struct dSv_event_tmp_flag_c", - "struct daObjH_Saku_c", + # "struct daObjH_Saku_c", "struct Z2StatusMgr", "struct mDoExt_3DlineMat0_c", "struct dSv_player_get_item_c", "struct dAttCatch_c", "struct fopAcM_wt_c", - "struct daObjCRVSTEEL_c", - "struct daObjCRVGATE_c", + # "struct daObjCRVSTEEL_c", + # "struct daObjCRVGATE_c", "struct daTag_FWall_c", "struct fopAcM_rc_c", - "struct daB_DS_c" + "struct daB_DS_c", + "struct dEvLib_callback_c", + "struct daPy_boomerangMove_c", + "struct dMenu_Insect_c", + "struct dInsect_c", + "struct dDlst_peekZ_c", + "struct mDoExt_bckAnm", + "struct fopAcM_lc_c", + "struct JUTNameTab", + "struct dMdl_obj_c", + "struct dMdl_mng_c", + "struct dMdl_c", + # "struct daObjLife_c", + # "struct daObjCRVLH_UP_c", + # "struct daObjCRVHAHEN_c", + "struct dDlst_peekZ_c", + "struct dSv_light_drop_c", + "struct TSinCosTable__template0", + "struct J3DShape", + "struct J3DPacket", + "struct J3DDrawBuffer", + "struct J3DPacket", + "struct daSetBgObj_c", + "struct WIND_INFLUENCE", + "struct dPa_modelEcallBack", + "struct daTagGra_c", + "struct daBaseNpc_path_c", + "struct daBaseNpc_moveBgActor_c", + "struct daBaseNpc_acMngr_c", + "struct dPaPo_c", + "struct cSGlobe", + "struct J3DTexMtxInfo", + "struct daNpcT_c", + "struct daNPC_TK_c", + "struct dCcD_SrcCps", + "struct dCcD_Cps", + "struct cM3dGCpsS", + "struct cM3dGCps", + "struct cM3dGLin", + "struct daNpc_Pouya_c", + "struct daNpc_Jagar_Param_c", + "struct daMidna_c", + "struct dAttHint_c", + "struct daTag_EvtArea_c", + "struct daNpcT_faceMotionAnmData_c", + "struct daNpcT_MotionSeqMngr_c", + "struct sequenceStepData_c", + "struct daNpcT_evtData_c", + "struct daNpcT_motionAnmData_c", + "struct daNpcT_Path_c", + "struct daNpcT_MatAnm_c", + "struct daNpcT_JntAnm_c", + "struct daNpcT_DmgStagger_c", + "struct daNpcT_ActorMngr_c", + "struct Z2WolfHowlMgr", + "struct daObj_SSBase_c", + "struct daMyna_c", + "struct DALKMIST_INFLUENCE", + "struct cM3dGTri", + "struct J3DAnmColor", + "struct mDoExt_bpkAnm", + # "struct daWtPillar_c", + "struct create_tag_class", + "struct daNpcF_c", + "struct daNpcF_anmPlayData", + "struct daNpcF_MatAnm_c", + "struct daNpcF_Lookat_c", + "struct daNpcF_ActorMngr_c", + "struct J3DTexNoAnm", + "struct J3DTexMtxAnm", + "struct J3DTevKColorAnm", + "struct J3DTevColorAnm", + "struct J3DMaterialAnm", + "struct J3DMatColorAnm", + "struct daE_HZ_c", + "struct JPAEmitterManager", + "struct dPa_simpleEcallBack", + "struct daTwGate_c", ] class ActorSetupManager: @@ -348,7 +520,7 @@ def move_remaining_types(self): if stripped_line.startswith("struct ") or stripped_line.startswith("class "): if stripped_line.startswith("struct ") and ("class" in stripped_line or "_c" in stripped_line): stripped_line = stripped_line.replace("struct ","class ") - if "hio" not in stripped_line.lower() and "_s {" not in stripped_line.lower() and "d_a_e" not in stripped_line.lower() and "obj_ystone_class" not in stripped_line.lower(): + if "param_c" not in stripped_line.lower() and "hio" not in stripped_line.lower() and "_s {" not in stripped_line.lower() and "d_a_e" not in stripped_line.lower() and "obj_ystone_class" not in stripped_line.lower(): # might fail if a tu has more than 1 actor self.actor_name = stripped_line.split(" ")[1] @@ -361,10 +533,15 @@ def move_remaining_types(self): migrated_types += 1 inside_struct_or_class = True - line = stripped_line + if "{};" not in stripped_line: + line = stripped_line+"public:\n" + else: + line = stripped_line + if inside_struct_or_class: struct_or_class_lines.append(line) + else: new_lines.append(line) @@ -429,7 +606,10 @@ def setup_class_size(self): for i, line in enumerate(header_lines): if self.actor_name in line: if "{};" in line: - new_lines.append("class " + self.actor_name + " : public fopEn_enemy_c {\n") + if self.actor_class_type == "enemy": + new_lines.append("class " + self.actor_name + " : public fopEn_enemy_c {\n") + elif self.actor_class_type == "actor": + new_lines.append("class " + self.actor_name + " : public fopAc_ac_c {\n") new_lines.append("private:\n") if self.actor_class_type == "enemy": @@ -443,6 +623,7 @@ def setup_class_size(self): in_class = True new_lines.append(line) elif in_class and "};" in line: + new_lines.append("\n") new_lines.append("private:\n") if self.actor_class_type == "enemy":