From b748eaca1e10c2170a28f135379151c2c50315d3 Mon Sep 17 00:00:00 2001 From: gymnast86 Date: Thu, 3 Sep 2026 10:30:26 -0500 Subject: [PATCH] Remove private specifiers from game code classes (#2375) * remove private specifiers from game code * fix formatting * fix more formatting * Add some missing public modifiers --------- Co-authored-by: Luke Street --- include/Z2AudioCS/SpkMixingBuffer.h | 1 - include/Z2AudioCS/SpkSpeakerCtrl.h | 1 - include/Z2AudioCS/SpkSystem.h | 1 - include/Z2AudioCS/SpkTable.h | 1 - include/Z2AudioCS/SpkWave.h | 1 - include/Z2AudioLib/Z2Creature.h | 1 - include/Z2AudioLib/Z2LinkMgr.h | 3 --- include/Z2AudioLib/Z2SceneMgr.h | 1 - include/Z2AudioLib/Z2SeMgr.h | 1 - include/Z2AudioLib/Z2SoundHandles.h | 1 - include/Z2AudioLib/Z2SoundMgr.h | 1 - include/Z2AudioLib/Z2SoundObjMgr.h | 1 - include/Z2AudioLib/Z2WolfHowlMgr.h | 1 - include/d/actor/d_a_alink.h | 2 -- include/d/actor/d_a_arrow.h | 1 - include/d/actor/d_a_b_dr.h | 1 - include/d/actor/d_a_b_ds.h | 1 - include/d/actor/d_a_b_mgn.h | 1 - include/d/actor/d_a_b_tn.h | 1 - include/d/actor/d_a_b_yo.h | 1 - include/d/actor/d_a_b_yo_ice.h | 1 - include/d/actor/d_a_b_zant_magic.h | 1 - include/d/actor/d_a_b_zant_mobile.h | 1 - include/d/actor/d_a_bg.h | 1 - include/d/actor/d_a_boomerang.h | 2 -- include/d/actor/d_a_canoe.h | 1 - include/d/actor/d_a_coach_fire.h | 1 - include/d/actor/d_a_cow.h | 1 - include/d/actor/d_a_crod.h | 1 - include/d/actor/d_a_cstaF.h | 1 - include/d/actor/d_a_cstatue.h | 1 - include/d/actor/d_a_demo_item.h | 1 - include/d/actor/d_a_door_boss.h | 1 - include/d/actor/d_a_door_bossL1.h | 1 - include/d/actor/d_a_door_bossL5.h | 1 - include/d/actor/d_a_door_dbdoor00.h | 1 - include/d/actor/d_a_door_knob00.h | 1 - include/d/actor/d_a_door_mbossL1.h | 1 - include/d/actor/d_a_door_push.h | 1 - include/d/actor/d_a_door_shutter.h | 1 - include/d/actor/d_a_e_ai.h | 1 - include/d/actor/d_a_e_bg.h | 1 - include/d/actor/d_a_e_dk.h | 1 - include/d/actor/d_a_e_dt.h | 1 - include/d/actor/d_a_e_fb.h | 1 - include/d/actor/d_a_e_fk.h | 1 - include/d/actor/d_a_e_fz.h | 1 - include/d/actor/d_a_e_ge.h | 1 - include/d/actor/d_a_e_gi.h | 1 - include/d/actor/d_a_e_gm.h | 1 - include/d/actor/d_a_e_hm.h | 1 - include/d/actor/d_a_e_hz.h | 1 - include/d/actor/d_a_e_kk.h | 1 - include/d/actor/d_a_e_oc.h | 1 - include/d/actor/d_a_e_oct_bg.h | 1 - include/d/actor/d_a_e_ot.h | 1 - include/d/actor/d_a_e_pm.h | 1 - include/d/actor/d_a_e_sb.h | 2 -- include/d/actor/d_a_e_sw.h | 1 - include/d/actor/d_a_e_tt.h | 1 - include/d/actor/d_a_e_vt.h | 1 - include/d/actor/d_a_e_ww.h | 1 - include/d/actor/d_a_e_ym.h | 1 - include/d/actor/d_a_e_zs.h | 1 - include/d/actor/d_a_kago.h | 1 - include/d/actor/d_a_midna.h | 1 - include/d/actor/d_a_movie_player.h | 1 - include/d/actor/d_a_npc.h | 7 +++---- include/d/actor/d_a_npc2.h | 1 - include/d/actor/d_a_npc4.h | 9 ++++----- include/d/actor/d_a_npc_aru.h | 1 - include/d/actor/d_a_npc_ash.h | 1 - include/d/actor/d_a_npc_ashB.h | 1 - include/d/actor/d_a_npc_besu.h | 1 - include/d/actor/d_a_npc_bou.h | 1 - include/d/actor/d_a_npc_bouS.h | 1 - include/d/actor/d_a_npc_chat.h | 1 - include/d/actor/d_a_npc_clerka.h | 1 - include/d/actor/d_a_npc_clerkb.h | 1 - include/d/actor/d_a_npc_clerkt.h | 1 - include/d/actor/d_a_npc_coach.h | 1 - include/d/actor/d_a_npc_doc.h | 1 - include/d/actor/d_a_npc_doorboy.h | 1 - include/d/actor/d_a_npc_fairy.h | 1 - include/d/actor/d_a_npc_fairy_seirei.h | 1 - include/d/actor/d_a_npc_gnd.h | 1 - include/d/actor/d_a_npc_gra.h | 1 - include/d/actor/d_a_npc_grc.h | 1 - include/d/actor/d_a_npc_grd.h | 1 - include/d/actor/d_a_npc_grm.h | 1 - include/d/actor/d_a_npc_grmc.h | 1 - include/d/actor/d_a_npc_gro.h | 1 - include/d/actor/d_a_npc_grr.h | 1 - include/d/actor/d_a_npc_grs.h | 1 - include/d/actor/d_a_npc_grz.h | 1 - include/d/actor/d_a_npc_guard.h | 1 - include/d/actor/d_a_npc_gwolf.h | 1 - include/d/actor/d_a_npc_hanjo.h | 1 - include/d/actor/d_a_npc_henna0.h | 2 +- include/d/actor/d_a_npc_hoz.h | 1 - include/d/actor/d_a_npc_impal.h | 1 - include/d/actor/d_a_npc_ins.h | 1 - include/d/actor/d_a_npc_jagar.h | 1 - include/d/actor/d_a_npc_kakashi.h | 1 - include/d/actor/d_a_npc_kasi_hana.h | 1 - include/d/actor/d_a_npc_kasi_kyu.h | 1 - include/d/actor/d_a_npc_kasi_mich.h | 1 - include/d/actor/d_a_npc_kdk.h | 2 +- include/d/actor/d_a_npc_kkri.h | 1 - include/d/actor/d_a_npc_kn.h | 1 - include/d/actor/d_a_npc_knj.h | 1 - include/d/actor/d_a_npc_kolin.h | 1 - include/d/actor/d_a_npc_kolinb.h | 1 - include/d/actor/d_a_npc_kyury.h | 1 - include/d/actor/d_a_npc_len.h | 1 - include/d/actor/d_a_npc_lud.h | 1 - include/d/actor/d_a_npc_maro.h | 1 - include/d/actor/d_a_npc_midp.h | 1 - include/d/actor/d_a_npc_moi.h | 1 - include/d/actor/d_a_npc_moir.h | 1 - include/d/actor/d_a_npc_pachi_besu.h | 1 - include/d/actor/d_a_npc_pachi_maro.h | 1 - include/d/actor/d_a_npc_pachi_taro.h | 1 - include/d/actor/d_a_npc_passer.h | 1 - include/d/actor/d_a_npc_passer2.h | 1 - include/d/actor/d_a_npc_post.h | 1 - include/d/actor/d_a_npc_pouya.h | 1 - include/d/actor/d_a_npc_prayer.h | 1 - include/d/actor/d_a_npc_raca.h | 1 - include/d/actor/d_a_npc_rafrel.h | 1 - include/d/actor/d_a_npc_saru.h | 1 - include/d/actor/d_a_npc_seib.h | 1 - include/d/actor/d_a_npc_seic.h | 1 - include/d/actor/d_a_npc_seid.h | 1 - include/d/actor/d_a_npc_seira.h | 1 - include/d/actor/d_a_npc_seira2.h | 1 - include/d/actor/d_a_npc_seirei.h | 1 - include/d/actor/d_a_npc_shad.h | 1 - include/d/actor/d_a_npc_shaman.h | 1 - include/d/actor/d_a_npc_shoe.h | 1 - include/d/actor/d_a_npc_sola.h | 1 - include/d/actor/d_a_npc_soldierA.h | 1 - include/d/actor/d_a_npc_soldierB.h | 1 - include/d/actor/d_a_npc_taro.h | 1 - include/d/actor/d_a_npc_the.h | 1 - include/d/actor/d_a_npc_theB.h | 1 - include/d/actor/d_a_npc_tkc.h | 1 - include/d/actor/d_a_npc_tkj.h | 1 - include/d/actor/d_a_npc_tks.h | 1 - include/d/actor/d_a_npc_toby.h | 1 - include/d/actor/d_a_npc_uri.h | 1 - include/d/actor/d_a_npc_wrestler.h | 1 - include/d/actor/d_a_npc_yamid.h | 1 - include/d/actor/d_a_npc_yamis.h | 1 - include/d/actor/d_a_npc_yamit.h | 1 - include/d/actor/d_a_npc_yelia.h | 1 - include/d/actor/d_a_npc_ykm.h | 1 - include/d/actor/d_a_npc_zanb.h | 1 - include/d/actor/d_a_npc_zant.h | 1 - include/d/actor/d_a_npc_zelR.h | 1 - include/d/actor/d_a_npc_zelRo.h | 1 - include/d/actor/d_a_npc_zelda.h | 1 - include/d/actor/d_a_npc_zrc.h | 1 - include/d/actor/d_a_npc_zrz.h | 1 - include/d/actor/d_a_obj_Lv5Key.h | 1 - include/d/actor/d_a_obj_Turara.h | 1 - include/d/actor/d_a_obj_TvCdlst.h | 1 - include/d/actor/d_a_obj_Y_taihou.h | 1 - include/d/actor/d_a_obj_amiShutter.h | 1 - include/d/actor/d_a_obj_ari.h | 1 - include/d/actor/d_a_obj_automata.h | 2 +- include/d/actor/d_a_obj_avalanche.h | 1 - include/d/actor/d_a_obj_batta.h | 1 - include/d/actor/d_a_obj_bbox.h | 1 - include/d/actor/d_a_obj_bemos.h | 1 - include/d/actor/d_a_obj_bhashi.h | 1 - include/d/actor/d_a_obj_bkdoor.h | 1 - include/d/actor/d_a_obj_bky_rock.h | 1 - include/d/actor/d_a_obj_bmWindow.h | 1 - include/d/actor/d_a_obj_bmshutter.h | 1 - include/d/actor/d_a_obj_bombf.h | 1 - include/d/actor/d_a_obj_bosswarp.h | 1 - include/d/actor/d_a_obj_boumato.h | 2 +- include/d/actor/d_a_obj_bsGate.h | 1 - include/d/actor/d_a_obj_bubblePilar.h | 1 - include/d/actor/d_a_obj_burnbox.h | 1 - include/d/actor/d_a_obj_carry.h | 1 - include/d/actor/d_a_obj_catdoor.h | 1 - include/d/actor/d_a_obj_cblock.h | 1 - include/d/actor/d_a_obj_cboard.h | 1 - include/d/actor/d_a_obj_cdoor.h | 1 - include/d/actor/d_a_obj_chandelier.h | 1 - include/d/actor/d_a_obj_chest.h | 1 - include/d/actor/d_a_obj_cho.h | 1 - include/d/actor/d_a_obj_cowdoor.h | 1 - include/d/actor/d_a_obj_crope.h | 1 - include/d/actor/d_a_obj_crvfence.h | 1 - include/d/actor/d_a_obj_crvgate.h | 1 - include/d/actor/d_a_obj_crvlh_down.h | 1 - include/d/actor/d_a_obj_crvlh_up.h | 1 - include/d/actor/d_a_obj_crvsteel.h | 1 - include/d/actor/d_a_obj_crystal.h | 1 - include/d/actor/d_a_obj_cwall.h | 1 - include/d/actor/d_a_obj_damCps.h | 1 - include/d/actor/d_a_obj_dan.h | 1 - include/d/actor/d_a_obj_digholl.h | 1 - include/d/actor/d_a_obj_digplace.h | 1 - include/d/actor/d_a_obj_digsnow.h | 1 - include/d/actor/d_a_obj_enemy_create.h | 1 - include/d/actor/d_a_obj_fallobj.h | 1 - include/d/actor/d_a_obj_fan.h | 1 - include/d/actor/d_a_obj_fchain.h | 1 - include/d/actor/d_a_obj_fireWood.h | 1 - include/d/actor/d_a_obj_fireWood2.h | 1 - include/d/actor/d_a_obj_firepillar.h | 1 - include/d/actor/d_a_obj_firepillar2.h | 1 - include/d/actor/d_a_obj_flag.h | 2 +- include/d/actor/d_a_obj_flag2.h | 1 - include/d/actor/d_a_obj_flag3.h | 1 - include/d/actor/d_a_obj_gadget.h | 2 +- include/d/actor/d_a_obj_ganonwall.h | 1 - include/d/actor/d_a_obj_ganonwall2.h | 1 - include/d/actor/d_a_obj_geyser.h | 1 - include/d/actor/d_a_obj_glowSphere.h | 1 - include/d/actor/d_a_obj_goGate.h | 1 - include/d/actor/d_a_obj_gomikabe.h | 1 - include/d/actor/d_a_obj_gpTaru.h | 1 - include/d/actor/d_a_obj_gra2.h | 1 - include/d/actor/d_a_obj_graWall.h | 1 - include/d/actor/d_a_obj_gra_rock.h | 1 - include/d/actor/d_a_obj_grave_stone.h | 1 - include/d/actor/d_a_obj_groundwater.h | 1 - include/d/actor/d_a_obj_grz_rock.h | 1 - include/d/actor/d_a_obj_hakai_brl.h | 1 - include/d/actor/d_a_obj_hakai_ftr.h | 1 - include/d/actor/d_a_obj_hasu2.h | 1 - include/d/actor/d_a_obj_hbombkoya.h | 1 - include/d/actor/d_a_obj_hfuta.h | 1 - include/d/actor/d_a_obj_hsTarget.h | 1 - include/d/actor/d_a_obj_iceleaf.h | 1 - include/d/actor/d_a_obj_itamato.h | 2 +- include/d/actor/d_a_obj_kabuto.h | 1 - include/d/actor/d_a_obj_kag.h | 1 - include/d/actor/d_a_obj_kago.h | 1 - include/d/actor/d_a_obj_kaisou.h | 1 - include/d/actor/d_a_obj_kamakiri.h | 1 - include/d/actor/d_a_obj_kantera.h | 1 - include/d/actor/d_a_obj_katatsumuri.h | 1 - include/d/actor/d_a_obj_kazeneko.h | 1 - include/d/actor/d_a_obj_kgate.h | 1 - include/d/actor/d_a_obj_kiPot.h | 1 - include/d/actor/d_a_obj_kjgjs.h | 1 - include/d/actor/d_a_obj_klift00.h | 1 - include/d/actor/d_a_obj_knBullet.h | 1 - include/d/actor/d_a_obj_kshutter.h | 1 - include/d/actor/d_a_obj_ktOnFire.h | 1 - include/d/actor/d_a_obj_kuwagata.h | 1 - include/d/actor/d_a_obj_kwheel00.h | 1 - include/d/actor/d_a_obj_kwheel01.h | 1 - include/d/actor/d_a_obj_kznkarm.h | 1 - include/d/actor/d_a_obj_ladder.h | 1 - include/d/actor/d_a_obj_laundry.h | 1 - include/d/actor/d_a_obj_laundry_rope.h | 1 - include/d/actor/d_a_obj_life_container.h | 1 - include/d/actor/d_a_obj_lv1Candle00.h | 1 - include/d/actor/d_a_obj_lv1Candle01.h | 1 - include/d/actor/d_a_obj_lv2Candle.h | 1 - include/d/actor/d_a_obj_lv3Candle.h | 1 - include/d/actor/d_a_obj_lv3Water.h | 1 - include/d/actor/d_a_obj_lv3Water2.h | 1 - include/d/actor/d_a_obj_lv3saka00.h | 1 - include/d/actor/d_a_obj_lv3waterEff.h | 1 - include/d/actor/d_a_obj_lv4CandleDemoTag.h | 1 - include/d/actor/d_a_obj_lv4EdShutter.h | 1 - include/d/actor/d_a_obj_lv4HsTarget.h | 1 - include/d/actor/d_a_obj_lv4PoGate.h | 1 - include/d/actor/d_a_obj_lv4RailWall.h | 1 - include/d/actor/d_a_obj_lv4SlideWall.h | 1 - include/d/actor/d_a_obj_lv4chandelier.h | 1 - include/d/actor/d_a_obj_lv4floor.h | 1 - include/d/actor/d_a_obj_lv4gear.h | 1 - include/d/actor/d_a_obj_lv4prelvtr.h | 1 - include/d/actor/d_a_obj_lv4sand.h | 1 - include/d/actor/d_a_obj_lv5FloorBoard.h | 1 - include/d/actor/d_a_obj_lv5IceWall.h | 1 - include/d/actor/d_a_obj_lv5SwIce.h | 1 - include/d/actor/d_a_obj_lv5ychndlr.h | 1 - include/d/actor/d_a_obj_lv6FurikoTrap.h | 1 - include/d/actor/d_a_obj_lv6Lblock.h | 1 - include/d/actor/d_a_obj_lv6SwGate.h | 1 - include/d/actor/d_a_obj_lv6SzGate.h | 1 - include/d/actor/d_a_obj_lv6Tenbin.h | 1 - include/d/actor/d_a_obj_lv6TogeRoll.h | 1 - include/d/actor/d_a_obj_lv6elevta.h | 1 - include/d/actor/d_a_obj_lv7bridge.h | 1 - include/d/actor/d_a_obj_lv8KekkaiTrap.h | 1 - include/d/actor/d_a_obj_lv8Lift.h | 1 - include/d/actor/d_a_obj_lv9SwShutter.h | 1 - include/d/actor/d_a_obj_magLift.h | 1 - include/d/actor/d_a_obj_magLiftRot.h | 1 - include/d/actor/d_a_obj_master_sword.h | 1 - include/d/actor/d_a_obj_metalbox.h | 2 +- include/d/actor/d_a_obj_mgate.h | 1 - include/d/actor/d_a_obj_mhole.h | 1 - include/d/actor/d_a_obj_mie.h | 2 +- include/d/actor/d_a_obj_mirror_6pole.h | 1 - include/d/actor/d_a_obj_mirror_chain.h | 1 - include/d/actor/d_a_obj_mirror_sand.h | 1 - include/d/actor/d_a_obj_mirror_screw.h | 1 - include/d/actor/d_a_obj_nameplate.h | 1 - include/d/actor/d_a_obj_nan.h | 1 - include/d/actor/d_a_obj_octhashi.h | 2 -- include/d/actor/d_a_obj_oiltubo.h | 1 - include/d/actor/d_a_obj_onsen.h | 1 - include/d/actor/d_a_obj_pdtile.h | 1 - include/d/actor/d_a_obj_pdwall.h | 1 - include/d/actor/d_a_obj_picture.h | 1 - include/d/actor/d_a_obj_pleaf.h | 2 +- include/d/actor/d_a_obj_poCandle.h | 1 - include/d/actor/d_a_obj_poFire.h | 1 - include/d/actor/d_a_obj_poTbox.h | 1 - include/d/actor/d_a_obj_prop.h | 1 - include/d/actor/d_a_obj_pumpkin.h | 2 +- include/d/actor/d_a_obj_rcircle.h | 1 - include/d/actor/d_a_obj_rfHole.h | 1 - include/d/actor/d_a_obj_rope_bridge.h | 1 - include/d/actor/d_a_obj_rotTrap.h | 1 - include/d/actor/d_a_obj_roten.h | 1 - include/d/actor/d_a_obj_rstair.h | 1 - include/d/actor/d_a_obj_saidan.h | 1 - include/d/actor/d_a_obj_sakuita.h | 1 - include/d/actor/d_a_obj_sakuita_rope.h | 1 - include/d/actor/d_a_obj_scannon.h | 1 - include/d/actor/d_a_obj_scannon_crs.h | 1 - include/d/actor/d_a_obj_scannon_ten.h | 1 - include/d/actor/d_a_obj_sekidoor.h | 1 - include/d/actor/d_a_obj_sekizo.h | 1 - include/d/actor/d_a_obj_shield.h | 1 - include/d/actor/d_a_obj_sm_door.h | 1 - include/d/actor/d_a_obj_smallkey.h | 2 +- include/d/actor/d_a_obj_smgdoor.h | 1 - include/d/actor/d_a_obj_smoke.h | 1 - include/d/actor/d_a_obj_smtile.h | 2 +- include/d/actor/d_a_obj_smw_stone.h | 1 - include/d/actor/d_a_obj_snowEffTag.h | 1 - include/d/actor/d_a_obj_snow_soup.h | 1 - include/d/actor/d_a_obj_spinLift.h | 1 - include/d/actor/d_a_obj_ss_base.h | 1 - include/d/actor/d_a_obj_ss_drink.h | 1 - include/d/actor/d_a_obj_ss_item.h | 1 - include/d/actor/d_a_obj_stairBlock.h | 1 - include/d/actor/d_a_obj_stick.h | 2 +- include/d/actor/d_a_obj_stone.h | 1 - include/d/actor/d_a_obj_stoneMark.h | 1 - include/d/actor/d_a_obj_stopper.h | 1 - include/d/actor/d_a_obj_stopper2.h | 1 - include/d/actor/d_a_obj_suisya.h | 1 - include/d/actor/d_a_obj_swBallA.h | 1 - include/d/actor/d_a_obj_swBallB.h | 1 - include/d/actor/d_a_obj_swLight.h | 1 - include/d/actor/d_a_obj_swchain.h | 1 - include/d/actor/d_a_obj_swhang.h | 1 - include/d/actor/d_a_obj_sword.h | 1 - include/d/actor/d_a_obj_syRock.h | 1 - include/d/actor/d_a_obj_szbridge.h | 1 - include/d/actor/d_a_obj_table.h | 1 - include/d/actor/d_a_obj_takaraDai.h | 1 - include/d/actor/d_a_obj_tgake.h | 1 - include/d/actor/d_a_obj_thashi.h | 2 -- include/d/actor/d_a_obj_timeFire.h | 1 - include/d/actor/d_a_obj_timer.h | 1 - include/d/actor/d_a_obj_tmoon.h | 1 - include/d/actor/d_a_obj_toaru_maki.h | 1 - include/d/actor/d_a_obj_togeTrap.h | 1 - include/d/actor/d_a_obj_tombo.h | 1 - include/d/actor/d_a_obj_tornado.h | 1 - include/d/actor/d_a_obj_twGate.h | 1 - include/d/actor/d_a_obj_vground.h | 1 - include/d/actor/d_a_obj_volcball.h | 1 - include/d/actor/d_a_obj_volcbom.h | 1 - include/d/actor/d_a_obj_waterGate.h | 1 - include/d/actor/d_a_obj_waterPillar.h | 1 - include/d/actor/d_a_obj_waterfall.h | 1 - include/d/actor/d_a_obj_wchain.h | 1 - include/d/actor/d_a_obj_wdStick.h | 1 - include/d/actor/d_a_obj_well_cover.h | 1 - include/d/actor/d_a_obj_wind_stone.h | 1 - include/d/actor/d_a_obj_window.h | 1 - include/d/actor/d_a_obj_wood_pendulum.h | 1 - include/d/actor/d_a_obj_wood_statue.h | 1 - include/d/actor/d_a_obj_wsword.h | 1 - include/d/actor/d_a_obj_yel_bag.h | 2 +- include/d/actor/d_a_obj_yobikusa.h | 1 - include/d/actor/d_a_obj_zrTurara.h | 1 - include/d/actor/d_a_obj_zrTuraraRock.h | 1 - include/d/actor/d_a_obj_zra_rock.h | 1 - include/d/actor/d_a_passer_mng.h | 1 - include/d/actor/d_a_peru.h | 1 - include/d/actor/d_a_player.h | 4 ---- include/d/actor/d_a_ppolamp.h | 1 - include/d/actor/d_a_spinner.h | 1 - include/d/actor/d_a_swBall.h | 1 - include/d/actor/d_a_swLBall.h | 1 - include/d/actor/d_a_swTime.h | 1 - include/d/actor/d_a_tag_CstaSw.h | 1 - include/d/actor/d_a_tag_TWgate.h | 1 - include/d/actor/d_a_tag_bottle_item.h | 2 +- include/d/actor/d_a_tag_chkpoint.h | 1 - include/d/actor/d_a_tag_evtarea.h | 1 - include/d/actor/d_a_tag_lv6CstaSw.h | 1 - include/d/actor/d_a_tag_mhint.h | 1 - include/d/actor/d_a_tag_mmsg.h | 1 - include/d/actor/d_a_tag_mstop.h | 1 - include/d/actor/d_a_tag_myna2.h | 1 - include/d/actor/d_a_tag_setBall.h | 1 - include/d/actor/d_a_tag_statue_evt.h | 1 - include/d/actor/d_a_tag_telop.h | 1 - include/d/actor/d_a_tag_waterfall.h | 1 - include/d/actor/d_a_tag_yami.h | 1 - include/d/actor/d_a_talk.h | 1 - include/d/actor/d_a_tbox.h | 1 - include/d/actor/d_a_tbox2.h | 1 - include/d/actor/d_a_title.h | 1 - include/d/d_a_shop_item_static.h | 1 - include/d/d_attention.h | 3 --- include/d/d_bg_plc.h | 1 - include/d/d_bg_s_acch.h | 4 +--- include/d/d_bg_s_grp_pass_chk.h | 1 - include/d/d_bg_s_poly_pass_chk.h | 1 - include/d/d_bg_s_roof_chk.h | 1 - include/d/d_bg_s_spl_grp_chk.h | 1 - include/d/d_bg_w.h | 1 - include/d/d_bg_w_base.h | 1 - include/d/d_bg_w_kcol.h | 1 - include/d/d_cc_d.h | 3 --- include/d/d_cc_mass_s.h | 4 ++-- include/d/d_com_inf_game.h | 1 - include/d/d_cursor_mng.h | 3 +-- include/d/d_demo.h | 6 ------ include/d/d_drawlist.h | 6 ------ include/d/d_event_data.h | 3 --- include/d/d_event_manager.h | 1 - include/d/d_file_sel_info.h | 1 - include/d/d_kantera_icon_meter.h | 2 -- include/d/d_ky_thunder.h | 1 - include/d/d_map.h | 2 -- include/d/d_menu_collect.h | 3 --- include/d/d_menu_dmap.h | 1 - include/d/d_menu_fishing.h | 1 - include/d/d_menu_fmap.h | 1 - include/d/d_menu_insect.h | 1 - include/d/d_menu_item_explain.h | 1 - include/d/d_menu_letter.h | 1 - include/d/d_menu_option.h | 1 - include/d/d_menu_ring.h | 1 - include/d/d_menu_save.h | 2 -- include/d/d_menu_skill.h | 1 - include/d/d_menu_window.h | 1 - include/d/d_meter2.h | 1 - include/d/d_meter2_draw.h | 1 - include/d/d_meter_map.h | 1 - include/d/d_model.h | 2 -- include/d/d_msg_flow.h | 1 - include/d/d_msg_out_font.h | 2 -- include/d/d_msg_scrn_3select.h | 1 - include/d/d_msg_scrn_boss.h | 1 - include/d/d_msg_scrn_explain.h | 1 - include/d/d_msg_string.h | 1 - include/d/d_msg_string_base.h | 1 - include/d/d_name.h | 1 - include/d/d_pane_class.h | 1 - include/d/d_pane_class_alpha.h | 1 - include/d/d_particle.h | 3 --- include/d/d_resorce.h | 1 - include/d/d_s_name.h | 1 - include/d/d_save.h | 2 -- include/d/d_save_HIO.h | 15 --------------- include/d/d_select_cursor.h | 1 - include/d/d_shop_item_ctrl.h | 1 - include/d/d_simple_model.h | 2 -- include/d/d_stage.h | 4 ---- include/d/d_timer.h | 2 -- include/d/d_vibration.h | 1 - include/m_Do/m_Do_dvd_thread.h | 2 +- 484 files changed, 28 insertions(+), 550 deletions(-) diff --git a/include/Z2AudioCS/SpkMixingBuffer.h b/include/Z2AudioCS/SpkMixingBuffer.h index ccdb8902b0..5cdfcd74bb 100644 --- a/include/Z2AudioCS/SpkMixingBuffer.h +++ b/include/Z2AudioCS/SpkMixingBuffer.h @@ -13,7 +13,6 @@ public: bool update(s32 chan); void bzeroBuffer(s32 chan); -private: /* 0x00 */ s16* mBuffer[4]; }; diff --git a/include/Z2AudioCS/SpkSpeakerCtrl.h b/include/Z2AudioCS/SpkSpeakerCtrl.h index 7216eed07d..372d5b1835 100644 --- a/include/Z2AudioCS/SpkSpeakerCtrl.h +++ b/include/Z2AudioCS/SpkSpeakerCtrl.h @@ -41,7 +41,6 @@ public: static bool checkRadioSensitivity(s32 chan); static bool isSubmitPlayByRadioSensitivity(s32 chan); -private: }; #endif /* Z2AUDIOCS_SPKSPEAKERCTRL_H */ diff --git a/include/Z2AudioCS/SpkSystem.h b/include/Z2AudioCS/SpkSystem.h index 05541c72e5..03b30cda6e 100644 --- a/include/Z2AudioCS/SpkSystem.h +++ b/include/Z2AudioCS/SpkSystem.h @@ -28,7 +28,6 @@ public: inline SpkData* getData(void) const { return mData; } inline SpkMixingBuffer* getMixingBuffer(void) const { return mMixingBuffer; } -private: /* 0x00 */ JKRHeap* mHeap; /* 0x04 */ SpkData* mData; /* 0x08 */ SpkMixingBuffer* mMixingBuffer; diff --git a/include/Z2AudioCS/SpkTable.h b/include/Z2AudioCS/SpkTable.h index 862fdba3c1..f2234f5a06 100644 --- a/include/Z2AudioCS/SpkTable.h +++ b/include/Z2AudioCS/SpkTable.h @@ -31,7 +31,6 @@ public: return (SpkTableParams*)mEntryOffset + num; } - // private: /* 0x00 */ bool mIsInitialized; /* 0x04 */ s32 mNumOfSound; /* 0x08 */ u32 mEntryOffset; diff --git a/include/Z2AudioCS/SpkWave.h b/include/Z2AudioCS/SpkWave.h index 6a604d8a50..72cde1c0a0 100644 --- a/include/Z2AudioCS/SpkWave.h +++ b/include/Z2AudioCS/SpkWave.h @@ -25,7 +25,6 @@ public: inline const void* getResource(void) const { return mWaveData; } inline void* getResource(void) { return mWaveData; } -private: /* 0x00 */ void* mWaveData; }; diff --git a/include/Z2AudioLib/Z2Creature.h b/include/Z2AudioLib/Z2Creature.h index c4f96ca742..c17394b75f 100644 --- a/include/Z2AudioLib/Z2Creature.h +++ b/include/Z2AudioLib/Z2Creature.h @@ -67,7 +67,6 @@ public: void playVoice(int); virtual Z2SoundHandlePool* startCreatureVoice(JAISoundID soundID, s8 reverb); -private: /* 0xA0 */ s8 mCitizenID; /* 0xA1 */ s8 field_0xa1; /* 0xA2 */ bool mLinkSearch; diff --git a/include/Z2AudioLib/Z2LinkMgr.h b/include/Z2AudioLib/Z2LinkMgr.h index 705394df5e..e64c1729eb 100644 --- a/include/Z2AudioLib/Z2LinkMgr.h +++ b/include/Z2AudioLib/Z2LinkMgr.h @@ -63,7 +63,6 @@ public: friend class Z2LinkSoundStarter; friend struct Z2RideSoundStarter; -private: /* 0x90 Z2LinkSoundStarter */ /* 0x94 */ Z2SoundObjSimple mKantera; /* 0xB4 */ Vec field_0xb4; @@ -123,7 +122,6 @@ public: virtual void deleteObject(); -private: /* 0x90 */ // Z2RideSoundStarter mSoundStarter; /* 0x98 */ bool mLinkRiding; }; // Size: 0x9C @@ -136,7 +134,6 @@ public: Z2SoundHandlePool* startFireSound(u16); Z2SoundHandlePool* startSound(JAISoundID soundID, u32 mapinfo, s8 reverb); -private: /* 0x20 */ f32 field_0x20; }; diff --git a/include/Z2AudioLib/Z2SceneMgr.h b/include/Z2AudioLib/Z2SceneMgr.h index 27b43d71f4..739c53bb10 100644 --- a/include/Z2AudioLib/Z2SceneMgr.h +++ b/include/Z2AudioLib/Z2SceneMgr.h @@ -47,7 +47,6 @@ public: s32 getBgmLoadStatus(u32 wave) { return getWaveLoadStatus(wave, 1); } u8 getDemoSeWaveNum() { return loadedDemoWave; } -// private: /* 0x00 */ JAISoundID BGM_ID; /* 0x04 */ int sceneNum; /* 0x08 */ int timer; diff --git a/include/Z2AudioLib/Z2SeMgr.h b/include/Z2AudioLib/Z2SeMgr.h index 3f8ca03eb3..7075308ef7 100644 --- a/include/Z2AudioLib/Z2SeMgr.h +++ b/include/Z2AudioLib/Z2SeMgr.h @@ -84,7 +84,6 @@ public: void homeMenuSeCallback(s32); #endif -private: /* 0x000 */ JAISoundHandle mSoundHandle[24]; /* 0x060 */ JAISoundHandles mSoundHandles; #if VERSION >= VERSION_WII_USA_R0 diff --git a/include/Z2AudioLib/Z2SoundHandles.h b/include/Z2AudioLib/Z2SoundHandles.h index 5915e5967b..1ad344c796 100644 --- a/include/Z2AudioLib/Z2SoundHandles.h +++ b/include/Z2AudioLib/Z2SoundHandles.h @@ -44,7 +44,6 @@ public: return (Z2SoundHandlePool*)getNth(index); } -private: /* 0xC */ u8 handleNum_; }; diff --git a/include/Z2AudioLib/Z2SoundMgr.h b/include/Z2AudioLib/Z2SoundMgr.h index cd6341b2cb..eabf9d2614 100644 --- a/include/Z2AudioLib/Z2SoundMgr.h +++ b/include/Z2AudioLib/Z2SoundMgr.h @@ -38,7 +38,6 @@ public: const JAISeqMgr* getSeqMgr() const { return &seqMgr_; } JAIStreamMgr* getStreamMgr() { return &streamMgr_; } -private: /* 0x004 */ JAISeMgr seMgr_; /* 0x728 */ JAISeqMgr seqMgr_; /* 0x79C */ JAIStreamMgr streamMgr_; diff --git a/include/Z2AudioLib/Z2SoundObjMgr.h b/include/Z2AudioLib/Z2SoundObjMgr.h index 687f9eaf0a..64bf058ba1 100644 --- a/include/Z2AudioLib/Z2SoundObjMgr.h +++ b/include/Z2AudioLib/Z2SoundObjMgr.h @@ -104,7 +104,6 @@ public: JSUList* getAllList() { return &allList_; } #endif -private: /* 0x00 */ JSUList field_0x0; #if PARTIAL_DEBUG || DEBUG /* 0x0C */ JSUList allList_; diff --git a/include/Z2AudioLib/Z2WolfHowlMgr.h b/include/Z2AudioLib/Z2WolfHowlMgr.h index 10b746a4c1..5376499715 100644 --- a/include/Z2AudioLib/Z2WolfHowlMgr.h +++ b/include/Z2AudioLib/Z2WolfHowlMgr.h @@ -70,7 +70,6 @@ public: u8 getReleaseTimer() { return mReleaseTimer; } u8 getCorrectCurveID() { return mCorrectCurveID; } -private: /* 0x00 */ JAISoundHandle mWolfHowlHandle; /* 0x04 */ JAISoundHandle mWindStoneHandle; /* 0x08 */ JAISoundHandle mGuideHandle; diff --git a/include/d/actor/d_a_alink.h b/include/d/actor/d_a_alink.h index 384891c8d5..95669633fd 100644 --- a/include/d/actor/d_a_alink.h +++ b/include/d/actor/d_a_alink.h @@ -77,7 +77,6 @@ public: virtual void draw(); virtual ~daAlink_blur_c() {} - // private: /* 0x010 */ ResTIMG* m_blurTex; /* 0x014 */ int field_0x14; /* 0x018 */ u8 field_0x18[4]; @@ -113,7 +112,6 @@ public: void onAppearFlg() { mAppearFlg = true; } -private: /* 0x04 */ s16 mHitFlg; /* 0x06 */ s16 mAppearFlg; /* 0x08 */ f32 mKeepMinY; diff --git a/include/d/actor/d_a_arrow.h b/include/d/actor/d_a_arrow.h index 47f86eeb50..f15cf1aca8 100644 --- a/include/d/actor/d_a_arrow.h +++ b/include/d/actor/d_a_arrow.h @@ -110,7 +110,6 @@ public: void setModelMatrix(MtxP mtx) { mpModel->setBaseTRMtx(mtx); } -private: /* 0x568 */ J3DModel* mpModel; /* 0x56C */ dBgS_ArrowLinChk field_0x56c; /* 0x5DC */ dBgS_ObjLinChk field_0x5dc; diff --git a/include/d/actor/d_a_b_dr.h b/include/d/actor/d_a_b_dr.h index e15a6e7ca5..d9f72089f4 100644 --- a/include/d/actor/d_a_b_dr.h +++ b/include/d/actor/d_a_b_dr.h @@ -82,7 +82,6 @@ public: u8 onTarget() { return mTarget = true; } u8 isBack() { return arg0; } -private: /* 0x05AC */ request_of_phase_process_class mPhase; /* 0x05B4 */ mDoExt_McaMorfSO* mpModelMorf; /* 0x05B8 */ J3DModel* mpPartModel; diff --git a/include/d/actor/d_a_b_ds.h b/include/d/actor/d_a_b_ds.h index ee737a955a..7013465e93 100644 --- a/include/d/actor/d_a_b_ds.h +++ b/include/d/actor/d_a_b_ds.h @@ -189,7 +189,6 @@ public: void onDemo() { mIsDemo = true; } void offDemo() { mIsDemo = false; } -private: /* 0x05AC */ request_of_phase_process_class mPhase; /* 0x05B4 */ mDoExt_McaMorfSO* mpMorf; /* 0x05B8 */ mDoExt_McaMorfSO* mpSwordMorf; diff --git a/include/d/actor/d_a_b_mgn.h b/include/d/actor/d_a_b_mgn.h index 272d02b1ef..1ad1dd5cf7 100644 --- a/include/d/actor/d_a_b_mgn.h +++ b/include/d/actor/d_a_b_mgn.h @@ -92,7 +92,6 @@ public: bool isDown() { return mDownFlag != 0; } bool isAppear() { return mAppearFlag != 0; } -private: /* 0x05AC */ request_of_phase_process_class mMgnPhase; /* 0x05B4 */ request_of_phase_process_class mMgnePhase; /* 0x05BC */ mDoExt_McaMorfSO* mpMgnModelMorf; diff --git a/include/d/actor/d_a_b_tn.h b/include/d/actor/d_a_b_tn.h index 7de1007d28..87b9cd2fae 100644 --- a/include/d/actor/d_a_b_tn.h +++ b/include/d/actor/d_a_b_tn.h @@ -131,7 +131,6 @@ public: int CreateHeap(); int create(); -private: /* 0x05AC */ request_of_phase_process_class mPhaseReq1; /* 0x05B4 */ request_of_phase_process_class mPhaseReq2; /* 0x05BC */ J3DModel* mpPartModels[16]; diff --git a/include/d/actor/d_a_b_yo.h b/include/d/actor/d_a_b_yo.h index a133d364d6..3550b95a1c 100644 --- a/include/d/actor/d_a_b_yo.h +++ b/include/d/actor/d_a_b_yo.h @@ -80,7 +80,6 @@ public: void setDrawOff() { mIsInactive = 1; } bool isEnemyDemoEnd() { return (u8)mIsEnemyDemoEnd != 0; } -private: /* 0x05AC */ request_of_phase_process_class mPhase1; /* 0x05B4 */ request_of_phase_process_class mPhase2; /* 0x05BC */ request_of_phase_process_class mPhase3; diff --git a/include/d/actor/d_a_b_yo_ice.h b/include/d/actor/d_a_b_yo_ice.h index 2ad2e5388d..e0f064fa9d 100644 --- a/include/d/actor/d_a_b_yo_ice.h +++ b/include/d/actor/d_a_b_yo_ice.h @@ -51,7 +51,6 @@ public: void setSubNumber(int i_subNumber) { mSubNumber = i_subNumber; } -private: /* 0x5AC */ request_of_phase_process_class mPhase; /* 0x5B4 */ J3DModel* mpModel; /* 0x5B8 */ Z2Creature mCreatureSound; diff --git a/include/d/actor/d_a_b_zant_magic.h b/include/d/actor/d_a_b_zant_magic.h index 0d05f9bd41..e37b055bfd 100644 --- a/include/d/actor/d_a_b_zant_magic.h +++ b/include/d/actor/d_a_b_zant_magic.h @@ -24,7 +24,6 @@ public: int _delete(); int create(); -private: /* 0x5AC */ Mtx field_0x5ac; /* 0x5DC */ cXyz field_0x5dc; /* 0x5E8 */ f32 field_0x5e8; diff --git a/include/d/actor/d_a_b_zant_mobile.h b/include/d/actor/d_a_b_zant_mobile.h index 3af85c56b1..18dcdbabc1 100644 --- a/include/d/actor/d_a_b_zant_mobile.h +++ b/include/d/actor/d_a_b_zant_mobile.h @@ -33,7 +33,6 @@ public: bool isSearchContinue() { return mSearchContinue != false; } void offSearchContinue() { mSearchContinue = false; } -private: /* 0x5AC */ request_of_phase_process_class mPhase; /* 0x5B4 */ mDoExt_McaMorfSO* mpMorf; /* 0x5B8 */ mDoExt_brkAnm* mpBrk; diff --git a/include/d/actor/d_a_bg.h b/include/d/actor/d_a_bg.h index 0a9859198b..51407a06c8 100644 --- a/include/d/actor/d_a_bg.h +++ b/include/d/actor/d_a_bg.h @@ -57,7 +57,6 @@ public: inline int execute(); inline int isDelete(); -private: /* 0x568 */ u8 field_0x568[0x570 - 0x568]; /* 0x570 */ daBg_Part mBgParts[6]; /* 0x5E8 */ dBgW* mpBgW; diff --git a/include/d/actor/d_a_boomerang.h b/include/d/actor/d_a_boomerang.h index fe39f226b7..2b527afe45 100644 --- a/include/d/actor/d_a_boomerang.h +++ b/include/d/actor/d_a_boomerang.h @@ -25,7 +25,6 @@ public: void onReserve() { mReserve = 1; } void offReserve() { mReserve = 0; } -private: /* 0x04 */ J2DScreen* m_cursorYellowScrn; /* 0x08 */ J2DPane* m_cursorYellowAllPane; /* 0x0C */ J2DPane* m_cursorYellow0Pane; @@ -126,7 +125,6 @@ public: bool getLockCntMax() { return m_lockCnt >= BOOMERANG_LOCK_MAX; } void onLockDistanceCancel() { onStateFlg0(FLG0_LOCK_DIST_CANCEL); } -private: /* 0x568 */ J3DModel* mp_boomModel; /* 0x56C */ J3DModel* mp_shippuModel; /* 0x570 */ J3DAnmTextureSRTKey* m_windBtk; diff --git a/include/d/actor/d_a_canoe.h b/include/d/actor/d_a_canoe.h index bf34a5eee7..bcd7615e18 100644 --- a/include/d/actor/d_a_canoe.h +++ b/include/d/actor/d_a_canoe.h @@ -65,7 +65,6 @@ public: field_0x1456 = 15; } -private: /* 0x0568 */ request_of_phase_process_class mPhaseReq; /* 0x0570 */ J3DModel* mpModel; /* 0x0574 */ J3DModel* mpPaddleModel; diff --git a/include/d/actor/d_a_coach_fire.h b/include/d/actor/d_a_coach_fire.h index f669525e9c..1e8aa2d661 100644 --- a/include/d/actor/d_a_coach_fire.h +++ b/include/d/actor/d_a_coach_fire.h @@ -42,7 +42,6 @@ public: void setNoHitTimer() { noHitTimer = 20; } inline int execute(); -private: /* 0x568 */ LIGHT_INFLUENCE mLightInfluence; /* 0x588 */ dCcD_Stts mStts; /* 0x5C4 */ dCcD_Sph mSph; diff --git a/include/d/actor/d_a_cow.h b/include/d/actor/d_a_cow.h index 403dc2aef6..e215256b91 100644 --- a/include/d/actor/d_a_cow.h +++ b/include/d/actor/d_a_cow.h @@ -208,7 +208,6 @@ public: u8 getCowIn() { return mCowIn; } u8 getNoNearCheckTimer() { return mNoNearCheckTimer; } -private: /* 0x568 */ u16 mFlags; /* 0x56c */ request_of_phase_process_class mPhase; /* 0x574 */ mDoExt_McaMorfSO* mpMorf; diff --git a/include/d/actor/d_a_crod.h b/include/d/actor/d_a_crod.h index 84938d454a..02311fbeb5 100644 --- a/include/d/actor/d_a_crod.h +++ b/include/d/actor/d_a_crod.h @@ -48,7 +48,6 @@ public: static f32 getFlyInitY() { return 40.0f; } static f32 getFlyInitZ() { return 50.0f; } -private: /* 0x568 */ J3DModel* mpBallModel; /* 0x56C */ mDoExt_bckAnm mBck; /* 0x588 */ J3DAnmTevRegKey* mpBallBrk; diff --git a/include/d/actor/d_a_cstaF.h b/include/d/actor/d_a_cstaF.h index 9cb9e06ff7..982aa061a8 100644 --- a/include/d/actor/d_a_cstaF.h +++ b/include/d/actor/d_a_cstaF.h @@ -40,7 +40,6 @@ public: }; static DUSK_GAME_DATA const BckTbl m_bckIdxTable[]; -private: /* 0x5A0 */ const char* m_arcName; /* 0x5A4 */ request_of_phase_process_class m_phase; /* 0x5AC */ J3DModel* mp_model; diff --git a/include/d/actor/d_a_cstatue.h b/include/d/actor/d_a_cstatue.h index ca0b3ca616..2b74240fb2 100644 --- a/include/d/actor/d_a_cstatue.h +++ b/include/d/actor/d_a_cstatue.h @@ -101,7 +101,6 @@ public: static DUSK_GAME_DATA u16 const m_bckIdxTable[daCstatueType_N][7]; -private: /* 0x568 */ const char* mResName; /* 0x56C */ request_of_phase_process_class mPhaseReq; /* 0x574 */ J3DModel* mModel; diff --git a/include/d/actor/d_a_demo_item.h b/include/d/actor/d_a_demo_item.h index ed6d195f5e..62780f572f 100644 --- a/include/d/actor/d_a_demo_item.h +++ b/include/d/actor/d_a_demo_item.h @@ -55,7 +55,6 @@ public: void setOffsetPos(cXyz i_pos) { mOffsetPos = i_pos; } void setMaxScale(f32 i_scale) { mMaxScale = i_scale; } -private: /* 0x92C */ cXyz mOffsetPos; /* 0x938 */ f32 mMaxScale; /* 0x93C */ u8 field_0x93c; diff --git a/include/d/actor/d_a_door_boss.h b/include/d/actor/d_a_door_boss.h index afd7984bf1..722afc0a84 100644 --- a/include/d/actor/d_a_door_boss.h +++ b/include/d/actor/d_a_door_boss.h @@ -50,7 +50,6 @@ public: void setAction(u8 i_action) { mAction = i_action; } -private: /* 0x568 */ request_of_phase_process_class mPhaseReq; /* 0x570 */ J3DModel* mpDoorModel; /* 0x574 */ J3DModel* mpLockModel; diff --git a/include/d/actor/d_a_door_bossL1.h b/include/d/actor/d_a_door_bossL1.h index 7e14025cd2..c0b8f2b44a 100644 --- a/include/d/actor/d_a_door_bossL1.h +++ b/include/d/actor/d_a_door_bossL1.h @@ -76,7 +76,6 @@ public: void setAction(u8 action) { mAction = action; } -private: /* 0x568 */ request_of_phase_process_class mPhase1; /* 0x570 */ request_of_phase_process_class mPhase2; /* 0x578 */ request_of_phase_process_class mPhase3; diff --git a/include/d/actor/d_a_door_bossL5.h b/include/d/actor/d_a_door_bossL5.h index 832f575ac1..d876bab9c8 100644 --- a/include/d/actor/d_a_door_bossL5.h +++ b/include/d/actor/d_a_door_bossL5.h @@ -72,7 +72,6 @@ public: return 1; } -private: /* 0x568 */ request_of_phase_process_class mPhase1; /* 0x570 */ request_of_phase_process_class mPhase2; /* 0x578 */ request_of_phase_process_class mPhase3; diff --git a/include/d/actor/d_a_door_dbdoor00.h b/include/d/actor/d_a_door_dbdoor00.h index 9b2f65e756..ec976c7f6b 100644 --- a/include/d/actor/d_a_door_dbdoor00.h +++ b/include/d/actor/d_a_door_dbdoor00.h @@ -41,7 +41,6 @@ public: void setAction(u8 i_action) { mAction = i_action; } -// private: /* 0x568 */ request_of_phase_process_class mPhaseReq; /* 0x570 */ request_of_phase_process_class mPhaseReq2; /* 0x578 */ J3DModel* mpModel; diff --git a/include/d/actor/d_a_door_knob00.h b/include/d/actor/d_a_door_knob00.h index 577b26b58e..742b8921c9 100644 --- a/include/d/actor/d_a_door_knob00.h +++ b/include/d/actor/d_a_door_knob00.h @@ -73,7 +73,6 @@ public: void onFlag(u16 flag) { field_0x60c |= flag; } int checkFlag(u16 flag) { return field_0x60c & flag; } -private: /* 0x568 */ request_of_phase_process_class mPhase1; /* 0x570 */ request_of_phase_process_class mPhase2; /* 0x578 */ J3DModel* mModel1; diff --git a/include/d/actor/d_a_door_mbossL1.h b/include/d/actor/d_a_door_mbossL1.h index 2bd95d920b..7b76f903bc 100644 --- a/include/d/actor/d_a_door_mbossL1.h +++ b/include/d/actor/d_a_door_mbossL1.h @@ -121,7 +121,6 @@ public: mAction = action; } -private: /* 0x568 */ request_of_phase_process_class mPhase1; /* 0x570 */ request_of_phase_process_class mPhase2; /* 0x578 */ request_of_phase_process_class mPhase3; diff --git a/include/d/actor/d_a_door_push.h b/include/d/actor/d_a_door_push.h index 5beb3aa564..f648ef208b 100644 --- a/include/d/actor/d_a_door_push.h +++ b/include/d/actor/d_a_door_push.h @@ -49,7 +49,6 @@ public: void setAction(u8 i_action) { mAction = i_action; } u32 getSceneNo() { return fopAcM_GetParamBit(this, 4, 6); } -// private: /* 0x5A0 */ request_of_phase_process_class mPhaseReq; /* 0x5A8 */ J3DModel* mpModel[2]; /* 0x5B0 */ dBgW* mpDoorBgW; diff --git a/include/d/actor/d_a_door_shutter.h b/include/d/actor/d_a_door_shutter.h index 34ea7f7fc9..c3b134ddb8 100644 --- a/include/d/actor/d_a_door_shutter.h +++ b/include/d/actor/d_a_door_shutter.h @@ -123,7 +123,6 @@ public: bool checkFlag(u16 flag) { return field_0x68e & flag; } void setAction(u8 action) { mAction = action; } -// private: /* 0x56C */ request_of_phase_process_class mPhase1; /* 0x574 */ request_of_phase_process_class mPhase2; /* 0x57C */ J3DModel* mModel1; diff --git a/include/d/actor/d_a_e_ai.h b/include/d/actor/d_a_e_ai.h index d2f1b6ec06..78c4174338 100644 --- a/include/d/actor/d_a_e_ai.h +++ b/include/d/actor/d_a_e_ai.h @@ -48,7 +48,6 @@ public: int CreateHeap(); int Create(); -private: /* 0x5AC */ JPABaseEmitter* mpEmitter; /* 0x5B0 */ request_of_phase_process_class m_phase; /* 0x5B8 */ u8 field_0x5b8; diff --git a/include/d/actor/d_a_e_bg.h b/include/d/actor/d_a_e_bg.h index c14b0cf533..b3b0e1d8bf 100644 --- a/include/d/actor/d_a_e_bg.h +++ b/include/d/actor/d_a_e_bg.h @@ -45,7 +45,6 @@ public: void setBgId(unsigned int i_bgId) { mBgId = i_bgId; } bool isBomb() { return mIsBomb; } -private: /* 0x5AC */ request_of_phase_process_class mPhaseReq; /* 0x5B4 */ mDoExt_McaMorfSO* mpMorfSO; /* 0x5B8 */ mDoExt_brkAnm* mpBrkAnm; diff --git a/include/d/actor/d_a_e_dk.h b/include/d/actor/d_a_e_dk.h index 381f8e1a62..2c7d46b84f 100644 --- a/include/d/actor/d_a_e_dk.h +++ b/include/d/actor/d_a_e_dk.h @@ -45,7 +45,6 @@ public: int create(); daE_DK_c(); -private: /* 0x5AC */ request_of_phase_process_class mPhaseReq; /* 0x5B4 */ mDoExt_McaMorfSO* mpMorfSO; /* 0x5B8 */ mDoExt_McaMorfSO* mpCoreMorfSO; diff --git a/include/d/actor/d_a_e_dt.h b/include/d/actor/d_a_e_dt.h index c5c83c76e0..0fdb13f4e5 100644 --- a/include/d/actor/d_a_e_dt.h +++ b/include/d/actor/d_a_e_dt.h @@ -83,7 +83,6 @@ public: MtxP getBackMtx() { return mpMorf->getModel()->getAnmMtx(1); } fpc_ProcID getDemoId() { return mDemoID; } -private: /* 0x05AC */ request_of_phase_process_class mPhase[3]; /* 0x05C4 */ J3DModel* mpChestModel; /* 0x05C8 */ J3DModel* mpSpitModel; diff --git a/include/d/actor/d_a_e_fb.h b/include/d/actor/d_a_e_fb.h index a4494c5e7a..ae48f77ea6 100644 --- a/include/d/actor/d_a_e_fb.h +++ b/include/d/actor/d_a_e_fb.h @@ -40,7 +40,6 @@ public: cPhs_Step create(); daE_FB_c(); -private: /* 0x5AC */ request_of_phase_process_class mPhaseReq; /* 0x5B4 */ mDoExt_McaMorfSO* mpMorf; /* 0x5B8 */ mDoExt_invisibleModel mInvisibleModel; diff --git a/include/d/actor/d_a_e_fk.h b/include/d/actor/d_a_e_fk.h index 390e4e3420..fb18f74792 100644 --- a/include/d/actor/d_a_e_fk.h +++ b/include/d/actor/d_a_e_fk.h @@ -52,7 +52,6 @@ public: void CreateChk(); int Create(); -private: /* 0x5AC */ u8 field_0x5AC[0x5B1 - 0x5AC]; /* 0x5B1 */ u8 mUpDownMode; /* 0x5B2 */ u8 field_0x5B2[0x5B6 - 0x5B2]; diff --git a/include/d/actor/d_a_e_fz.h b/include/d/actor/d_a_e_fz.h index e0b838aa51..e40232b74f 100644 --- a/include/d/actor/d_a_e_fz.h +++ b/include/d/actor/d_a_e_fz.h @@ -63,7 +63,6 @@ public: s32 CreateHeap(); s32 create(); -private: /* 0x5AC */ request_of_phase_process_class mPhaseReq; /**< Phase request used when creating the actor. */ /* 0x5B4 */ J3DModel* mpModel; /**< Pointer to the Mini Freezard's model. */ /* 0x5B8 */ mDoExt_invisibleModel mInvisibleModel; /**< Invisible model used for the Mini Freezard. */ diff --git a/include/d/actor/d_a_e_ge.h b/include/d/actor/d_a_e_ge.h index 527e5bb5fa..3c4d4ffbee 100644 --- a/include/d/actor/d_a_e_ge.h +++ b/include/d/actor/d_a_e_ge.h @@ -61,7 +61,6 @@ public: u8 getGroupNo() { return mGroupNo; } -private: /* 0x5AC */ request_of_phase_process_class mPhaseReq; /* 0x5B4 */ mDoExt_McaMorfSO* mpMorfSO; /* 0x5B8 */ Z2CreatureEnemy mSound; diff --git a/include/d/actor/d_a_e_gi.h b/include/d/actor/d_a_e_gi.h index adadfd03b8..a731797f32 100644 --- a/include/d/actor/d_a_e_gi.h +++ b/include/d/actor/d_a_e_gi.h @@ -47,7 +47,6 @@ public: bool isBattleOn() { return mIsBattleOn; } bool isAttackStart() { return mIsAttackStart; } -private: /* 0x05AC */ request_of_phase_process_class mPhase; /* 0x05B4 */ mDoExt_McaMorfSO* mpModelMorf; /* 0x05B8 */ J3DModel* mpSwordModel; diff --git a/include/d/actor/d_a_e_gm.h b/include/d/actor/d_a_e_gm.h index 370dea9150..de8c0d6acc 100644 --- a/include/d/actor/d_a_e_gm.h +++ b/include/d/actor/d_a_e_gm.h @@ -62,7 +62,6 @@ public: BOOL checkAction(actionFunc action) { return mAction == action; } BOOL checkOldAction(actionFunc action) { return mOldAction == action; } -private: /* 0x5AC */ request_of_phase_process_class mPhase; /* 0x5B4 */ dBgS_AcchCir mAcchCir; /* 0x5F4 */ dBgS_ObjAcch mObjAcch; diff --git a/include/d/actor/d_a_e_hm.h b/include/d/actor/d_a_e_hm.h index 85f6e5422c..9be48a53f3 100644 --- a/include/d/actor/d_a_e_hm.h +++ b/include/d/actor/d_a_e_hm.h @@ -65,7 +65,6 @@ public: void CheckWall(); void CreateStyle(); int Create(); -private: /* 0x5AC */ u8 field_0x5ac; /* 0x5AD */ u8 field_0x5ad; /* 0x5AE */ u8 field_0x5ae; diff --git a/include/d/actor/d_a_e_hz.h b/include/d/actor/d_a_e_hz.h index 539d808cf5..e48a72ee69 100644 --- a/include/d/actor/d_a_e_hz.h +++ b/include/d/actor/d_a_e_hz.h @@ -64,7 +64,6 @@ public: void setInitPos(); int create(); -private: /* 0x5AC */ request_of_phase_process_class mPhaseReq; /* 0x5B4 */ request_of_phase_process_class mPhaseReq2; /* 0x5BC */ mDoExt_McaMorfSO* mpMorfSO; diff --git a/include/d/actor/d_a_e_kk.h b/include/d/actor/d_a_e_kk.h index 890da0eba2..a249cafc74 100644 --- a/include/d/actor/d_a_e_kk.h +++ b/include/d/actor/d_a_e_kk.h @@ -49,7 +49,6 @@ public: int CreateHeap(); int create(); -private: /* 0x05AC */ request_of_phase_process_class mPhaseReq; /* 0x05B4 */ mDoExt_McaMorfSO* mpMorfSO; /* 0x05B8 */ mDoExt_McaMorfSO* mpWeaponMorfSO; diff --git a/include/d/actor/d_a_e_oc.h b/include/d/actor/d_a_e_oc.h index 7f60afa878..2d40d9bcbc 100644 --- a/include/d/actor/d_a_e_oc.h +++ b/include/d/actor/d_a_e_oc.h @@ -87,7 +87,6 @@ public: daE_OC_c* getTalkOc() { return mpTalk; } J3DModel* getOcModel() { return mpMorf->getModel(); } -private: /* 0x5a0 */ request_of_phase_process_class mPhaseReqs[2]; /* 0x5bc */ mDoExt_McaMorfSO* mpMorf; /* 0x5c0 */ J3DModel* mpModel; diff --git a/include/d/actor/d_a_e_oct_bg.h b/include/d/actor/d_a_e_oct_bg.h index cd5b6b27cd..9033e03736 100644 --- a/include/d/actor/d_a_e_oct_bg.h +++ b/include/d/actor/d_a_e_oct_bg.h @@ -54,7 +54,6 @@ public: u32 checkAction(actionFunc func) { return field_0xb58 == func; } bool checkNormalAttk() { return checkAction(&daE_OctBg_c::normal_attack); } -private: /* 0x5AC */ request_of_phase_process_class mPhase; /* 0x5B4 */ mDoExt_McaMorfSO* field_0x5b4; /* 0x5B8 */ mDoExt_brkAnm* field_0x5b8; diff --git a/include/d/actor/d_a_e_ot.h b/include/d/actor/d_a_e_ot.h index 54e8399b7b..3505062e3c 100644 --- a/include/d/actor/d_a_e_ot.h +++ b/include/d/actor/d_a_e_ot.h @@ -54,7 +54,6 @@ public: /* 0x4 */ ACT_DAMAGE, }; -private: /* 0x5AC */ request_of_phase_process_class mPhase; /* 0x5B4 */ mDoExt_McaMorfSO* mpMorf; /* 0x5B8 */ J3DModel* mpEggModel; diff --git a/include/d/actor/d_a_e_pm.h b/include/d/actor/d_a_e_pm.h index edec93c6a2..35368eff61 100644 --- a/include/d/actor/d_a_e_pm.h +++ b/include/d/actor/d_a_e_pm.h @@ -84,7 +84,6 @@ public: u8 SwitchChk() { return mStage; } u8 DoorChk() { return mDoorAction; } -private: /* 0x5AC */ fpc_ProcID mPuppetID[4]; /* 0x5BC */ u8 field_0x5bc[0x5DC - 0x5BC]; /* 0x5DC */ u8 mDoorAction; diff --git a/include/d/actor/d_a_e_sb.h b/include/d/actor/d_a_e_sb.h index e015ecc5bc..bd7d8c9bdc 100644 --- a/include/d/actor/d_a_e_sb.h +++ b/include/d/actor/d_a_e_sb.h @@ -57,7 +57,6 @@ public: int Delete(); void setBaseMtx(); cPhs_Step Create(); -private: /* 0x5AC */ int field_0x5ac; /* 0x5B0 */ int field_0x5b0; /* 0x5B4 */ int field_0x5b4; @@ -78,7 +77,6 @@ private: public: /* 0x5EC */ cXyz* field_0x5ec; /* 0x5F0 */ f32 field_0x5f0; -private: /* 0x5F4 */ cXyz field_0x5f4; /* 0x600 */ s16 field_0x600; /* 0x602 */ u8 field_0x602; diff --git a/include/d/actor/d_a_e_sw.h b/include/d/actor/d_a_e_sw.h index b073dae952..6f6a71f16d 100644 --- a/include/d/actor/d_a_e_sw.h +++ b/include/d/actor/d_a_e_sw.h @@ -82,7 +82,6 @@ public: bool d_checkOldAction(void (daE_SW_c::*action)()) { return field_0xb0c == action; } -private: /* 0x5AC */ request_of_phase_process_class mPhase; /* 0x5B4 */ mDoExt_McaMorfSO* mpModelMorf; /* 0x5B8 */ Z2CreatureEnemy mSound; diff --git a/include/d/actor/d_a_e_tt.h b/include/d/actor/d_a_e_tt.h index f3b79a69b3..38dc53ac3f 100644 --- a/include/d/actor/d_a_e_tt.h +++ b/include/d/actor/d_a_e_tt.h @@ -47,7 +47,6 @@ public: int CreateHeap(); int create(); -private: /* 0x5AC */ request_of_phase_process_class mPhaseReq; /* 0x5B4 */ request_of_phase_process_class mPhaseReq2; /* 0x5BC */ mDoExt_McaMorfSO* mpMorfSO; diff --git a/include/d/actor/d_a_e_vt.h b/include/d/actor/d_a_e_vt.h index 4b6082adae..b55bb4891a 100644 --- a/include/d/actor/d_a_e_vt.h +++ b/include/d/actor/d_a_e_vt.h @@ -146,7 +146,6 @@ public: int create(); daE_VA_c(); -private: /* 0x005AC */ request_of_phase_process_class mPhase; /* 0x005B4 */ mDoExt_McaMorfSO* mpMorf; /* 0x005B8 */ mDoExt_McaMorfSO* mpEndEfMorf; diff --git a/include/d/actor/d_a_e_ww.h b/include/d/actor/d_a_e_ww.h index fc1083c34e..f1ebac248a 100644 --- a/include/d/actor/d_a_e_ww.h +++ b/include/d/actor/d_a_e_ww.h @@ -59,7 +59,6 @@ public: void setAttack() { mActionMode = 10; } f32 const getSpeedF() { return speedF; } -private: /* 0x5AC */ request_of_phase_process_class mPhase; /* 0x5B4 */ mDoExt_McaMorfSO* mpModelMorf; /* 0x5B8 */ Z2CreatureEnemy mSound; diff --git a/include/d/actor/d_a_e_ym.h b/include/d/actor/d_a_e_ym.h index 9638736b46..699d14d98f 100644 --- a/include/d/actor/d_a_e_ym.h +++ b/include/d/actor/d_a_e_ym.h @@ -122,7 +122,6 @@ public: u8 getSwitchBit() { return mSwitchBit; } u8 isHide() { return mIsHide; } -private: /* 0x5AC */ request_of_phase_process_class mPhase; /* 0x5B4 */ mDoExt_McaMorfSO* mpMorf; /* 0x5B8 */ mDoExt_brkAnm* mpBrk; diff --git a/include/d/actor/d_a_e_zs.h b/include/d/actor/d_a_e_zs.h index d15b384650..93dbd82d89 100644 --- a/include/d/actor/d_a_e_zs.h +++ b/include/d/actor/d_a_e_zs.h @@ -39,7 +39,6 @@ public: int CreateHeap(); int create(); -private: /* 0x5ac */ request_of_phase_process_class mPhase; /* 0x5b4 */ mDoExt_McaMorfSO* mpMorf; /* 0x5b8 */ Z2CreatureEnemy mSound; diff --git a/include/d/actor/d_a_kago.h b/include/d/actor/d_a_kago.h index 33ec51672f..ba0e77a37c 100644 --- a/include/d/actor/d_a_kago.h +++ b/include/d/actor/d_a_kago.h @@ -140,7 +140,6 @@ public: void setEatYm() { field_0x6d8 |= (u8) 4; } MtxP getMouthMtx() { return mAnm_p->getModel()->getAnmMtx(7); } -private: /* 0x568 */ request_of_phase_process_class mPhase; /* 0x570 */ mDoExt_McaMorfSO* mAnm_p; /* 0x574 */ Z2CreatureEnemy mSound; diff --git a/include/d/actor/d_a_midna.h b/include/d/actor/d_a_midna.h index 2b07386ca7..1371dce12c 100644 --- a/include/d/actor/d_a_midna.h +++ b/include/d/actor/d_a_midna.h @@ -423,7 +423,6 @@ public: static DUSK_GAME_DATA daMidna_texData_s const m_texDataTable[21]; static DUSK_GAME_DATA daMidna_anmData_s const m_anmDataTable[53]; -// private: /* 0x568 */ request_of_phase_process_class mPhase; /* 0x570 */ J3DModel* mpModel; /* 0x574 */ J3DModel* mpShadowModel; diff --git a/include/d/actor/d_a_movie_player.h b/include/d/actor/d_a_movie_player.h index fbd8784d40..24b1c683d3 100644 --- a/include/d/actor/d_a_movie_player.h +++ b/include/d/actor/d_a_movie_player.h @@ -166,7 +166,6 @@ public: static DUSK_GAME_DATA daMP_c* m_myObj; -private: /* 0x568 */ u32 (*mpGetMovieRestFrame)(void); /* 0x56C */ void (*mpSetPercentMovieVol)(f32); /* 0x570 */ u32 (*mpTHPGetTotalFrame)(void); diff --git a/include/d/actor/d_a_npc.h b/include/d/actor/d_a_npc.h index 7b99f1e2fe..51425bb912 100644 --- a/include/d/actor/d_a_npc.h +++ b/include/d/actor/d_a_npc.h @@ -29,7 +29,7 @@ struct daNpc_GetParam3 { // name unknown }; class daNpcT_ActorMngr_c { -private: +public: /* 0x0 */ fpc_ProcID mActorID; public: @@ -44,7 +44,7 @@ public: }; class daNpcT_MatAnm_c : public J3DMaterialAnm { -private: +public: /* 0x0F4 */ mutable f32 field_0xF4; /* 0x0F8 */ mutable f32 field_0xF8; /* 0x0FC */ f32 mNowOffsetX; @@ -102,7 +102,6 @@ public: } void setOffset(int i_offset) { mOffset = i_offset; } -private: /* 0x00 */ sequenceStepData_c const* mpSeqData; /* 0x04 */ int mStepNum; /* 0x08 */ int mNo; @@ -217,7 +216,7 @@ public: }; class daNpcT_JntAnm_c { -private: +public: /* 0x000 */ daNpcT_ActorMngr_c mActrMngr; /* 0x008 */ cXyz mPos; /* 0x014 */ cXyz mAttnPos; diff --git a/include/d/actor/d_a_npc2.h b/include/d/actor/d_a_npc2.h index 0f8ab6ba20..2453ba1f30 100644 --- a/include/d/actor/d_a_npc2.h +++ b/include/d/actor/d_a_npc2.h @@ -15,7 +15,6 @@ public: fopAc_ac_c* getActor(); virtual ~daBaseNpc_acMngr_c() {} -private: /* 0x04 */ fpc_ProcID mActorId; }; diff --git a/include/d/actor/d_a_npc4.h b/include/d/actor/d_a_npc4.h index d195eb9669..1bf39f54ec 100644 --- a/include/d/actor/d_a_npc4.h +++ b/include/d/actor/d_a_npc4.h @@ -12,7 +12,7 @@ #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" class daNpcF_ActorMngr_c { -private: +public: /* 0x0 */ fpc_ProcID mActorID; public: @@ -52,7 +52,7 @@ BOOL daNpcF_chkPassed(cXyz i_pos, dPnt* i_points, u16 i_idx, u16 i_num, BOOL i_i BOOL daNpcF_chkDoBtnEqSpeak(fopAc_ac_c* i_actor_p); class daNpcF_SPCurve_c { -private: +public: /* 0x00 */ u16 mNurbs; /* 0x02 */ u16 field_0x02; /* 0x04 */ u8 mIsReversed; @@ -119,7 +119,7 @@ public: }; // Size: 0x630 class daNpcF_MatAnm_c : public J3DMaterialAnm { -private: +public: /* 0x0F4 */ mutable f32 field_0xF4; /* 0x0F8 */ mutable f32 field_0xF8; /* 0x0FC */ f32 mNowOffsetX; @@ -138,7 +138,7 @@ public: }; class daNpcF_Lookat_c { -private: +public: /* 0x00 */ cXyz mJointPos[4]; /* 0x30 */ cXyz* mAttnPos_p; /* 0x34 */ csXyz mAngularMoveDis[4]; @@ -406,7 +406,6 @@ public: STATIC_ASSERT(sizeof(daNpcF_c) == 0xB48); class daNpcF_MoveBgActor_c : public daNpcF_c { -private: public: // these functions are inferred based on daBaseNpc_moveBgActor_c - // defining them in this order fixes weak function order for this class in d_a_npc diff --git a/include/d/actor/d_a_npc_aru.h b/include/d/actor/d_a_npc_aru.h index e822850a7e..a41e45acba 100644 --- a/include/d/actor/d_a_npc_aru.h +++ b/include/d/actor/d_a_npc_aru.h @@ -174,7 +174,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[7]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[7]; -private: /* 0xE40 */ NPC_ARU_HIO_CLASS* mpHIO; /* 0xE44 */ dCcD_Cyl mCyl; /* 0xF80 */ u8 mType; diff --git a/include/d/actor/d_a_npc_ash.h b/include/d/actor/d_a_npc_ash.h index 46c850a372..e9f6e3427a 100644 --- a/include/d/actor/d_a_npc_ash.h +++ b/include/d/actor/d_a_npc_ash.h @@ -145,7 +145,6 @@ public: static DUSK_GAME_DATA EventFn mEvtSeqList[6]; -private: /* 0xB48 */ Z2Creature mCreatureSound; /* 0xBD8 */ J3DModel* mModelBow; /* 0xBDC */ J3DModel* mModelQuiver; diff --git a/include/d/actor/d_a_npc_ashB.h b/include/d/actor/d_a_npc_ashB.h index e257db2402..9b158acf2d 100644 --- a/include/d/actor/d_a_npc_ashB.h +++ b/include/d/actor/d_a_npc_ashB.h @@ -137,7 +137,6 @@ public: static DUSK_GAME_DATA EventFn DUSK_CONST mEvtSeqList[2]; -private: /* 0xB48 */ Z2Creature mCreatureSound; /* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm; /* 0xBDC */ J3DModel* mpModel; diff --git a/include/d/actor/d_a_npc_besu.h b/include/d/actor/d_a_npc_besu.h index 646c4860bd..04579f595b 100644 --- a/include/d/actor/d_a_npc_besu.h +++ b/include/d/actor/d_a_npc_besu.h @@ -143,7 +143,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[15]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[15]; -private: /* 0x0E40 */ mDoExt_McaMorfSO* mpCupModelMorf; /* 0x0E44 */ NPC_BESU_HIO_CLASS* mpHIO; /* 0x0E48 */ J3DModel* mpClothModel[1]; diff --git a/include/d/actor/d_a_npc_bou.h b/include/d/actor/d_a_npc_bou.h index d2c1c0ef2f..d0379b9a1b 100644 --- a/include/d/actor/d_a_npc_bou.h +++ b/include/d/actor/d_a_npc_bou.h @@ -168,7 +168,6 @@ public: return 0; } -private: /* 0xE40 */ NPC_BOU_HIO_CLASS* mpHIO; /* 0xE44 */ dCcD_Cyl mCyl1; /* 0xF80 */ u8 mType; diff --git a/include/d/actor/d_a_npc_bouS.h b/include/d/actor/d_a_npc_bouS.h index a3431cfec7..7d6f48fb53 100644 --- a/include/d/actor/d_a_npc_bouS.h +++ b/include/d/actor/d_a_npc_bouS.h @@ -130,7 +130,6 @@ public: static DUSK_GAME_DATA eventFunc mEvtSeqList[4]; -private: /* 0xB48 */ Z2Creature mSound; /* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm; /* 0xBDC */ daNpcF_Lookat_c mLookat; diff --git a/include/d/actor/d_a_npc_chat.h b/include/d/actor/d_a_npc_chat.h index 5bdbee8869..88ddc9a8b3 100644 --- a/include/d/actor/d_a_npc_chat.h +++ b/include/d/actor/d_a_npc_chat.h @@ -104,7 +104,6 @@ public: static DUSK_GAME_DATA eventFunc DUSK_CONST mEvtSeqList[1]; -private: /* 0xB48 */ Z2CreatureCitizen mSound; /* 0xBEC */ u8 field_0xbec[0xbf0 - 0xbec]; /* 0xBF0 */ J3DModel* mObjModel; diff --git a/include/d/actor/d_a_npc_clerka.h b/include/d/actor/d_a_npc_clerka.h index 12ef5a3b97..6479bae503 100644 --- a/include/d/actor/d_a_npc_clerka.h +++ b/include/d/actor/d_a_npc_clerka.h @@ -127,7 +127,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1]; -private: /* 0x0F7C */ NPC_CLERKA_HIO_CLASS* mpHIO; /* 0x0F80 */ dCcD_Cyl mCyl; /* 0x10BC */ u8 mType; diff --git a/include/d/actor/d_a_npc_clerkb.h b/include/d/actor/d_a_npc_clerkb.h index c6c2ef83fb..9bc2a39a3a 100644 --- a/include/d/actor/d_a_npc_clerkb.h +++ b/include/d/actor/d_a_npc_clerkb.h @@ -140,7 +140,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1]; -private: /* 0x0F7C */ mDoExt_bpkAnm mBpkAnm2; /* 0x0F7C */ NPC_CLERKB_HIO_CLASS* mpHIO; /* 0x0F98 */ dCcD_Cyl mCyl; diff --git a/include/d/actor/d_a_npc_clerkt.h b/include/d/actor/d_a_npc_clerkt.h index 6acfb8970f..a476f83449 100644 --- a/include/d/actor/d_a_npc_clerkt.h +++ b/include/d/actor/d_a_npc_clerkt.h @@ -128,7 +128,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1]; -private: /* 0x0F7C */ NPC_CLERKT_HIO_CLASS* mpHIO; /* 0x0F80 */ dCcD_Cyl mCyl; /* 0x10BC */ u8 mType; diff --git a/include/d/actor/d_a_npc_coach.h b/include/d/actor/d_a_npc_coach.h index f50cbd87a5..e0ecd63fc2 100644 --- a/include/d/actor/d_a_npc_coach.h +++ b/include/d/actor/d_a_npc_coach.h @@ -297,7 +297,6 @@ public: static DUSK_GAME_DATA daNpcCoach_Attr_c const M_attr; static u16 const ParticleName[10]; -private: /* 0x0568 */ daNpcChHorse_c mChHorse; /* 0x0E7C */ daNpcChHarness_c mChHarness; /* 0x15D0 */ daNpcChCoach_c mChCoach; diff --git a/include/d/actor/d_a_npc_doc.h b/include/d/actor/d_a_npc_doc.h index 417251e10b..191a2e5bf2 100644 --- a/include/d/actor/d_a_npc_doc.h +++ b/include/d/actor/d_a_npc_doc.h @@ -136,7 +136,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1]; -private: /* 0xE40 */ NPC_DOC_HIO_CLASS* mpHIO; /* 0xE44 */ dCcD_Cyl mCyl; /* 0xF80 */ u8 mType; diff --git a/include/d/actor/d_a_npc_doorboy.h b/include/d/actor/d_a_npc_doorboy.h index 31568dd2f6..3fd6ef1ce8 100644 --- a/include/d/actor/d_a_npc_doorboy.h +++ b/include/d/actor/d_a_npc_doorboy.h @@ -80,7 +80,6 @@ public: static DUSK_GAME_DATA EventFn DUSK_CONST mEvtSeqList[1]; -private: /* 0xB48 */ Z2CreatureCitizen mSound; /* 0xBEC */ u8 field_0xbec[0xbf0 - 0xbec]; /* 0xBF0 */ daNpcF_Lookat_c mLookat; diff --git a/include/d/actor/d_a_npc_fairy.h b/include/d/actor/d_a_npc_fairy.h index da9977ed37..ff2df4260b 100644 --- a/include/d/actor/d_a_npc_fairy.h +++ b/include/d/actor/d_a_npc_fairy.h @@ -296,7 +296,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[18]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[18]; -// private: /* 0x0E40 */ NPC_FAIRY_HIO_CLASS* mHIO; /* 0x0E44 */ dCcD_Cyl mCyl; /* 0x0F80 */ u8 mType; diff --git a/include/d/actor/d_a_npc_fairy_seirei.h b/include/d/actor/d_a_npc_fairy_seirei.h index a0ad9342ed..d47b2a17eb 100644 --- a/include/d/actor/d_a_npc_fairy_seirei.h +++ b/include/d/actor/d_a_npc_fairy_seirei.h @@ -93,7 +93,6 @@ public: static DUSK_GAME_DATA DUSK_CONST char* mCutNameList[1]; static DUSK_GAME_DATA DUSK_CONST cutFunc mCutList[1]; -private: /* 0xE40 */ NPC_FAIRY_SEIREI_HIO_CLASS* mpHIO; /* 0xE44 */ u8 mType; /* 0xE48 */ dCcD_Cyl mCyl; diff --git a/include/d/actor/d_a_npc_gnd.h b/include/d/actor/d_a_npc_gnd.h index f61d7e0214..cb0289055e 100644 --- a/include/d/actor/d_a_npc_gnd.h +++ b/include/d/actor/d_a_npc_gnd.h @@ -99,7 +99,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1]; -private: /* 0xE40 */ NPC_GND_HIO_CLASS* mpHIO; /* 0xE44 */ dCcD_Cyl mCyl1; /* 0xF80 */ u8 mType; diff --git a/include/d/actor/d_a_npc_gra.h b/include/d/actor/d_a_npc_gra.h index 333cf5d299..f16b445195 100644 --- a/include/d/actor/d_a_npc_gra.h +++ b/include/d/actor/d_a_npc_gra.h @@ -142,7 +142,6 @@ public: typedef BOOL (daNpc_grA_c::*cut_type)(int); static DUSK_GAME_DATA cut_type DUSK_CONST mEvtCutList[]; -private: typedef BOOL (daNpc_grA_c::*daNpc_grA_c_Action)(void*); /* 0x0B48 */ Z2Creature mCreature; diff --git a/include/d/actor/d_a_npc_grc.h b/include/d/actor/d_a_npc_grc.h index ac7dfa9869..53a483b51d 100644 --- a/include/d/actor/d_a_npc_grc.h +++ b/include/d/actor/d_a_npc_grc.h @@ -92,7 +92,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList; static DUSK_GAME_DATA EventFn DUSK_CONST mEvtCutList[1]; -private: /* 0xB48 */ Z2Creature mSound; /* 0xBD8 */ int field_0xbd8; /* 0xBDC */ daNpcF_Lookat_c mLookat; diff --git a/include/d/actor/d_a_npc_grd.h b/include/d/actor/d_a_npc_grd.h index 24871ab24c..64afa3ef2c 100644 --- a/include/d/actor/d_a_npc_grd.h +++ b/include/d/actor/d_a_npc_grd.h @@ -84,7 +84,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList[2]; static DUSK_GAME_DATA cutFunc DUSK_CONST mEvtCutList[2]; -private: /* 0xB48 */ Z2Creature mSound; /* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm; /* 0xBDC */ daNpcF_Lookat_c mLookat; diff --git a/include/d/actor/d_a_npc_grm.h b/include/d/actor/d_a_npc_grm.h index d7c30ba90f..c820eabbc3 100644 --- a/include/d/actor/d_a_npc_grm.h +++ b/include/d/actor/d_a_npc_grm.h @@ -134,7 +134,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[2]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[2]; -private: /* 0x0F7C */ NPC_GRM_HIO_CLASS* mpHIO; /* 0x0F80 */ dCcD_Cyl mCyl; /* 0x10BC */ u8 mType; diff --git a/include/d/actor/d_a_npc_grmc.h b/include/d/actor/d_a_npc_grmc.h index 1761c82869..1d87c39a4d 100644 --- a/include/d/actor/d_a_npc_grmc.h +++ b/include/d/actor/d_a_npc_grmc.h @@ -127,7 +127,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1]; -private: /* 0x0F7C */ NPC_GRMC_HIO_CLASS* mpHIO; /* 0x0F80 */ dCcD_Cyl mCyl; /* 0x10BC */ u8 mType; diff --git a/include/d/actor/d_a_npc_gro.h b/include/d/actor/d_a_npc_gro.h index b2a5595bd9..8bc6c8c93e 100644 --- a/include/d/actor/d_a_npc_gro.h +++ b/include/d/actor/d_a_npc_gro.h @@ -88,7 +88,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList[3]; static DUSK_GAME_DATA cutFunc DUSK_CONST mEvtCutList[3]; -private: /* 0xB48 */ Z2Creature mSound; /* 0xBD8 */ J3DModel* mpOtherModel[1]; /* 0xBDC */ daNpcF_MatAnm_c* mpMatAnm; diff --git a/include/d/actor/d_a_npc_grr.h b/include/d/actor/d_a_npc_grr.h index 6dfa8512bc..4caf927d75 100644 --- a/include/d/actor/d_a_npc_grr.h +++ b/include/d/actor/d_a_npc_grr.h @@ -86,7 +86,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList; static DUSK_GAME_DATA cutFunc DUSK_CONST mEvtCutList[1]; -private: /* 0xB48 */ Z2Creature mSound; /* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm; /* 0xBDC */ daNpcF_Lookat_c mLookat; diff --git a/include/d/actor/d_a_npc_grs.h b/include/d/actor/d_a_npc_grs.h index 5ec4354dd1..9c1ac788dc 100644 --- a/include/d/actor/d_a_npc_grs.h +++ b/include/d/actor/d_a_npc_grs.h @@ -87,7 +87,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList[2]; static DUSK_GAME_DATA cutFunc DUSK_CONST mEvtCutList[2]; -private: /* 0xB48 */ Z2Creature mSound; /* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm; /* 0xBDC */ J3DModel* mpModel; diff --git a/include/d/actor/d_a_npc_grz.h b/include/d/actor/d_a_npc_grz.h index f49c878ff7..249720276f 100644 --- a/include/d/actor/d_a_npc_grz.h +++ b/include/d/actor/d_a_npc_grz.h @@ -119,7 +119,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList[7]; static DUSK_GAME_DATA cutFunc DUSK_CONST mEvtCutList[7]; -private: /* 0x0B48 */ Z2Creature mSound; /* 0x0BD8 */ daNpcF_MatAnm_c* mpMatAnm; /* 0x0BDC */ daNpcF_Lookat_c mLookat; diff --git a/include/d/actor/d_a_npc_guard.h b/include/d/actor/d_a_npc_guard.h index bceab108e5..59a6719c9d 100644 --- a/include/d/actor/d_a_npc_guard.h +++ b/include/d/actor/d_a_npc_guard.h @@ -62,7 +62,6 @@ public: static DUSK_GAME_DATA actionFunc ActionTable[7][2]; -private: /* 0xAC8 */ J3DModel* mpModel; /* 0xACC */ J3DModel* mpModel2; /* 0xAD0 */ J3DAnmTransformKey* mpAnmKey; diff --git a/include/d/actor/d_a_npc_gwolf.h b/include/d/actor/d_a_npc_gwolf.h index bd577e18e7..f7f4bc5a8e 100644 --- a/include/d/actor/d_a_npc_gwolf.h +++ b/include/d/actor/d_a_npc_gwolf.h @@ -107,7 +107,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList[5]; static DUSK_GAME_DATA cutFunc DUSK_CONST mEvtCutList[5]; -private: /* 0xB48 */ Z2Creature mSound; /* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm; /* 0xBDC */ daNpcF_Lookat_c mLookat; diff --git a/include/d/actor/d_a_npc_hanjo.h b/include/d/actor/d_a_npc_hanjo.h index e9daf3bb0e..76d354b743 100644 --- a/include/d/actor/d_a_npc_hanjo.h +++ b/include/d/actor/d_a_npc_hanjo.h @@ -221,7 +221,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[6]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[6]; static DUSK_GAME_DATA dCcD_SrcSph DUSK_CONST mStoneCcDSph; -private: /* 0x0E40 */ NPC_HANJO_HIO_CLASS* mpHIO; /* 0x0E44 */ J3DModel* mModel1; /* 0x0E48 */ J3DModel* mModel2; diff --git a/include/d/actor/d_a_npc_henna0.h b/include/d/actor/d_a_npc_henna0.h index 112904d144..63da974cde 100644 --- a/include/d/actor/d_a_npc_henna0.h +++ b/include/d/actor/d_a_npc_henna0.h @@ -12,7 +12,7 @@ * */ class d_a_npc_henna0 : public fopAc_ac_c { - private: + public: /* 0x568 */ u8 field_0x568[0x828 - 0x568]; }; diff --git a/include/d/actor/d_a_npc_hoz.h b/include/d/actor/d_a_npc_hoz.h index aec84cf761..57a2169c78 100644 --- a/include/d/actor/d_a_npc_hoz.h +++ b/include/d/actor/d_a_npc_hoz.h @@ -128,7 +128,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[8]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[]; -private: /* 0xE40 */ NPC_HOZ_HIO_CLASS* mpHIO; /* 0xE44 */ dCcD_Cyl mCyl; /* 0xF80 */ u8 mType; diff --git a/include/d/actor/d_a_npc_impal.h b/include/d/actor/d_a_npc_impal.h index f0102ab698..f6753be0e2 100644 --- a/include/d/actor/d_a_npc_impal.h +++ b/include/d/actor/d_a_npc_impal.h @@ -123,7 +123,6 @@ public: static DUSK_GAME_DATA EventFn mEvtSeqList[4]; -private: /* 0xB48 */ Z2Creature mCreatureSound; /* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm; /* 0xBDC */ daNpcF_Lookat_c mLookat; diff --git a/include/d/actor/d_a_npc_ins.h b/include/d/actor/d_a_npc_ins.h index 620358a297..fd133a7a79 100644 --- a/include/d/actor/d_a_npc_ins.h +++ b/include/d/actor/d_a_npc_ins.h @@ -121,7 +121,6 @@ public: static DUSK_GAME_DATA eventFunc mEvtSeqList[1]; -private: /* 0xB48 */ Z2Creature mSound; /* 0xBD8 */ J3DModel* mpUmbrellaModel; /* 0xBDC */ J3DModel* mpKagoModel; diff --git a/include/d/actor/d_a_npc_jagar.h b/include/d/actor/d_a_npc_jagar.h index 13147762dd..e933d28bf4 100644 --- a/include/d/actor/d_a_npc_jagar.h +++ b/include/d/actor/d_a_npc_jagar.h @@ -225,7 +225,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[7]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[7]; -private: /* 0x0E40 */ NPC_JAGAR_HIO_CLASS* mpHIO; /* 0x0E44 */ dCcD_Cyl mCyl1; /* 0x0F80 */ u8 mType; diff --git a/include/d/actor/d_a_npc_kakashi.h b/include/d/actor/d_a_npc_kakashi.h index c3f57b383a..a21117376d 100644 --- a/include/d/actor/d_a_npc_kakashi.h +++ b/include/d/actor/d_a_npc_kakashi.h @@ -116,7 +116,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[4]; static DUSK_GAME_DATA int (daNpc_Kakashi_c::* DUSK_CONST mCutList[])(int); -private: /* 0x0E40 */ NPC_KAKASHI_HIO_CLASS* mpHIO; /* 0x0E44 */ Z2SoundObjSimple mSound; /* 0x0E64 */ dCcD_Cyl mCcCyl; diff --git a/include/d/actor/d_a_npc_kasi_hana.h b/include/d/actor/d_a_npc_kasi_hana.h index 625cb31845..302c3d84ab 100644 --- a/include/d/actor/d_a_npc_kasi_hana.h +++ b/include/d/actor/d_a_npc_kasi_hana.h @@ -206,7 +206,6 @@ public: static DUSK_GAME_DATA f32 mTargetTagDist; static DUSK_GAME_DATA s16 mWolfAngle; -private: /* 0x0B48 */ Z2CreatureCitizen mSound; /* 0x0BEC */ u8 field_0xbec[0xbf0 - 0xbec]; /* 0x0BF0 */ daNpcF_Lookat_c mLookat; diff --git a/include/d/actor/d_a_npc_kasi_kyu.h b/include/d/actor/d_a_npc_kasi_kyu.h index 962a2e04cc..8ba34391c7 100644 --- a/include/d/actor/d_a_npc_kasi_kyu.h +++ b/include/d/actor/d_a_npc_kasi_kyu.h @@ -125,7 +125,6 @@ public: static DUSK_GAME_DATA f32 mTargetTagDist; static DUSK_GAME_DATA s16 mWolfAngle; -private: /* 0x0B48 */ Z2CreatureCitizen mSound; /* 0x0BEC */ u8 field_0xbec[0xbf0 - 0xbec]; /* 0x0BF0 */ daNpcF_Lookat_c mLookat; diff --git a/include/d/actor/d_a_npc_kasi_mich.h b/include/d/actor/d_a_npc_kasi_mich.h index efa1a221c6..08361fe134 100644 --- a/include/d/actor/d_a_npc_kasi_mich.h +++ b/include/d/actor/d_a_npc_kasi_mich.h @@ -126,7 +126,6 @@ public: static DUSK_GAME_DATA f32 mTargetTagDist; static DUSK_GAME_DATA s16 mWolfAngle; -private: /* 0x0B48 */ Z2CreatureCitizen mSound; /* 0x0BEC */ u8 field_0xbec[0xbf0 - 0xbec]; /* 0x0BF0 */ daNpcF_Lookat_c mLookat; diff --git a/include/d/actor/d_a_npc_kdk.h b/include/d/actor/d_a_npc_kdk.h index 6f701e33af..a647cc706d 100644 --- a/include/d/actor/d_a_npc_kdk.h +++ b/include/d/actor/d_a_npc_kdk.h @@ -12,7 +12,7 @@ * */ class daNpcKdk_c : public fopAc_ac_c { -private: +public: /* 0x568 */ u8 field_0x568[0xFA0 - 0x568]; }; diff --git a/include/d/actor/d_a_npc_kkri.h b/include/d/actor/d_a_npc_kkri.h index c6e173480d..1265f6e27f 100644 --- a/include/d/actor/d_a_npc_kkri.h +++ b/include/d/actor/d_a_npc_kkri.h @@ -121,7 +121,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[3]; static DUSK_GAME_DATA int (daNpc_Kkri_c::* DUSK_CONST mCutList[])(int); -private: /* 0xE40 */ NPC_KKRI_HIO_CLASS* mpHIO; /* 0xE44 */ dCcD_Cyl mCcCyl; /* 0xF80 */ u8 mType; diff --git a/include/d/actor/d_a_npc_kn.h b/include/d/actor/d_a_npc_kn.h index 9e1794db97..7df2cfa247 100644 --- a/include/d/actor/d_a_npc_kn.h +++ b/include/d/actor/d_a_npc_kn.h @@ -421,7 +421,6 @@ public: static DUSK_GAME_DATA fopAc_ac_c* mFindActorPtrs[50]; static DUSK_GAME_DATA int mFindCount; -private: /* 0x0E44 */ J3DModel* mpPodModel; /* 0x0E48 */ mDoExt_invisibleModel mInvisModel; /* 0x0E50 */ dKy_tevstr_c mTevStr; diff --git a/include/d/actor/d_a_npc_knj.h b/include/d/actor/d_a_npc_knj.h index f8db1cdedb..7738d231b2 100644 --- a/include/d/actor/d_a_npc_knj.h +++ b/include/d/actor/d_a_npc_knj.h @@ -83,7 +83,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1]; -private: /* 0xE40 */ NPC_KNJ_HIO_CLASS* mpHIO; /* 0xE44 */ u8 mType; /* 0xE48 */ actionFunc mNextAction; diff --git a/include/d/actor/d_a_npc_kolin.h b/include/d/actor/d_a_npc_kolin.h index 28f455be35..860ae1b942 100644 --- a/include/d/actor/d_a_npc_kolin.h +++ b/include/d/actor/d_a_npc_kolin.h @@ -161,7 +161,6 @@ public: return 0; } -private: /* 0x0E40 */ NPC_KOLIN_HIO_CLASS* mpHIO; /* 0x0E44 */ J3DModel* mpClothModel; /* 0x0E48 */ dCcD_Cyl field_0xe48; diff --git a/include/d/actor/d_a_npc_kolinb.h b/include/d/actor/d_a_npc_kolinb.h index bf4392a697..4655234347 100644 --- a/include/d/actor/d_a_npc_kolinb.h +++ b/include/d/actor/d_a_npc_kolinb.h @@ -166,7 +166,6 @@ public: u32 getModelType() { return fopAcM_GetParam(this) >> 28; } -private: /* 0xE40 */ NPC_KOLINB_HIO_CLASS* mpHIO; /* 0xE44 */ dCcD_Cyl field_0xe44; /* 0xF80 */ Mtx mMtx; diff --git a/include/d/actor/d_a_npc_kyury.h b/include/d/actor/d_a_npc_kyury.h index 8469dd3528..7322dfd905 100644 --- a/include/d/actor/d_a_npc_kyury.h +++ b/include/d/actor/d_a_npc_kyury.h @@ -126,7 +126,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[2]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[2]; -private: /* 0xE40 */ NPC_KYURY_HIO_CLASS* mpHIO; /* 0xE44 */ J3DModel* mpModel[2]; /* 0xE4C */ dCcD_Cyl mCyl; diff --git a/include/d/actor/d_a_npc_len.h b/include/d/actor/d_a_npc_len.h index 13b959c3b7..b22a0059e0 100644 --- a/include/d/actor/d_a_npc_len.h +++ b/include/d/actor/d_a_npc_len.h @@ -113,7 +113,6 @@ public: u8 getPathID() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; } u8 getBitSW() { return (fopAcM_GetParam(this) & 0xff0000) >> 16; } -private: /* 0xE40 */ NPC_LEN_HIO_CLASS* mpHIO; /* 0xE44 */ dCcD_Cyl mCyl; /* 0xF80 */ u8 mType; diff --git a/include/d/actor/d_a_npc_lud.h b/include/d/actor/d_a_npc_lud.h index afecfdc0c7..a2be5fa65d 100644 --- a/include/d/actor/d_a_npc_lud.h +++ b/include/d/actor/d_a_npc_lud.h @@ -114,7 +114,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[8]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[8]; -private: /* 0xE40 */ mDoExt_McaMorfSO* mpBowlMorf; /* 0xE44 */ NPC_LUD_HIO_CLASS* mpHIO; /* 0xE48 */ J3DModel* mpModel[2]; diff --git a/include/d/actor/d_a_npc_maro.h b/include/d/actor/d_a_npc_maro.h index 1c51a63b44..8acd11e43c 100644 --- a/include/d/actor/d_a_npc_maro.h +++ b/include/d/actor/d_a_npc_maro.h @@ -187,7 +187,6 @@ public: return (fopAcM_GetParam(this) & 0xF000000) >> 24; } -private: /* 0x0F7C */ NPC_MARO_HIO_CLASS* mpHIO; /* 0x0F80 */ dCcD_Cyl mCyl1; /* 0x10BC */ int field_0x10bc; diff --git a/include/d/actor/d_a_npc_midp.h b/include/d/actor/d_a_npc_midp.h index 60efbbac80..3021051d77 100644 --- a/include/d/actor/d_a_npc_midp.h +++ b/include/d/actor/d_a_npc_midp.h @@ -151,7 +151,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1]; -private: /* 0xE40 */ NPC_MIDP_HIO_CLASS* mpHIO; /* 0xE44 */ dCcD_Cyl mCyl; /* 0xF80 */ u8 mType; diff --git a/include/d/actor/d_a_npc_moi.h b/include/d/actor/d_a_npc_moi.h index 547c3a1dcd..94e1ef8861 100644 --- a/include/d/actor/d_a_npc_moi.h +++ b/include/d/actor/d_a_npc_moi.h @@ -161,7 +161,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[5]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[5]; -private: /* 0x0E40 */ NPC_MOI_HIO_CLASS* mpHIO; /* 0x0E44 */ J3DModel* mpModel[6]; /* 0x0E5C */ dCcD_Cyl mCyl[4]; diff --git a/include/d/actor/d_a_npc_moir.h b/include/d/actor/d_a_npc_moir.h index f9aa841a60..f217ab7698 100644 --- a/include/d/actor/d_a_npc_moir.h +++ b/include/d/actor/d_a_npc_moir.h @@ -214,7 +214,6 @@ public: static DUSK_GAME_DATA EventFn mEvtSeqList[4]; -private: /* 0xB48 */ Z2Creature mSound; /* 0xBD8 */ J3DModel* mpHeadgearModel; /* 0xBDC */ daNpcF_MatAnm_c* mpMatAnm; diff --git a/include/d/actor/d_a_npc_pachi_besu.h b/include/d/actor/d_a_npc_pachi_besu.h index 7fa17d8b2d..2cc79d2364 100644 --- a/include/d/actor/d_a_npc_pachi_besu.h +++ b/include/d/actor/d_a_npc_pachi_besu.h @@ -147,7 +147,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[11]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[11]; -private: /* 0xE40 */ NPC_PACHI_BESU_HIO_CLASS* mpHIO; /* 0xE44 */ dCcD_Cyl mCyl; /* 0xF80 */ u8 mType; diff --git a/include/d/actor/d_a_npc_pachi_maro.h b/include/d/actor/d_a_npc_pachi_maro.h index 379c2c204b..be398f85e0 100644 --- a/include/d/actor/d_a_npc_pachi_maro.h +++ b/include/d/actor/d_a_npc_pachi_maro.h @@ -187,7 +187,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[11]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[11]; -private: /* 0xE40 */ NPC_PACHI_MARO_HIO_CLASS* mpHIO; /* 0xE44 */ dCcD_Cyl mCyl; /* 0xF80 */ u8 mType; diff --git a/include/d/actor/d_a_npc_pachi_taro.h b/include/d/actor/d_a_npc_pachi_taro.h index 12de6aedf4..e424292f6c 100644 --- a/include/d/actor/d_a_npc_pachi_taro.h +++ b/include/d/actor/d_a_npc_pachi_taro.h @@ -199,7 +199,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[11]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[11]; -private: /* 0x0E40 */ NPC_PACHI_TARO_HIO_CLASS* mpHIO; /* 0x0E44 */ J3DModel* mpModels[2]; /* 0x0E4C */ dCcD_Cyl mCyl; diff --git a/include/d/actor/d_a_npc_passer.h b/include/d/actor/d_a_npc_passer.h index d2f6f0b764..e166e635b9 100644 --- a/include/d/actor/d_a_npc_passer.h +++ b/include/d/actor/d_a_npc_passer.h @@ -123,7 +123,6 @@ public: static DUSK_GAME_DATA seqFunc m_seq26_funcTbl[3]; static DUSK_GAME_DATA seqFunc m_seq27_funcTbl[1]; -private: /* 0xAC8 */ J3DModel* mpModel; /* 0xACC */ PathTrace_c m_path; /* 0xAF4 */ daNpcPasser_c::actionFunc* mAction; diff --git a/include/d/actor/d_a_npc_passer2.h b/include/d/actor/d_a_npc_passer2.h index 792bbfd329..148a3b2981 100644 --- a/include/d/actor/d_a_npc_passer2.h +++ b/include/d/actor/d_a_npc_passer2.h @@ -53,7 +53,6 @@ public: static DUSK_GAME_DATA actionFunc ActionTable[1][2]; -private: /* 0x9EC */ J3DModel* mpModel; /* 0x9F0 */ PathTrace_c m_path; /* 0xA18 */ actionFunc* mAction; diff --git a/include/d/actor/d_a_npc_post.h b/include/d/actor/d_a_npc_post.h index 7b31506513..ef44f7ee1e 100644 --- a/include/d/actor/d_a_npc_post.h +++ b/include/d/actor/d_a_npc_post.h @@ -156,7 +156,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[2]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[2]; -private: /* 0x0E40 */ mDoExt_McaMorfSO* mpFlagModelMorf; /* 0x0E44 */ NPC_POST_HIO_CLASS* mHIO; /* 0x0E48 */ J3DModel* mpLetterModels[2]; diff --git a/include/d/actor/d_a_npc_pouya.h b/include/d/actor/d_a_npc_pouya.h index c30b0e0199..4af1d1ce68 100644 --- a/include/d/actor/d_a_npc_pouya.h +++ b/include/d/actor/d_a_npc_pouya.h @@ -149,7 +149,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[3]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[3]; -private: /* 0xE40 */ NPC_POUYA_HIO_CLASS* mpHIO; /* 0xE44 */ J3DModel* mpModel[1]; /* 0xE48 */ dCcD_Cyl mCyl; diff --git a/include/d/actor/d_a_npc_prayer.h b/include/d/actor/d_a_npc_prayer.h index bc2735a43f..438bc784f9 100644 --- a/include/d/actor/d_a_npc_prayer.h +++ b/include/d/actor/d_a_npc_prayer.h @@ -79,7 +79,6 @@ public: static DUSK_GAME_DATA EvtSeq DUSK_CONST mEvtSeqList[]; -private: /* 0xB48 */ Z2CreatureCitizen mSound; /* 0xBEC */ u8 field_0xBEC[0xBF0 - 0xBEC]; /* 0xBF0 */ daNpcF_Lookat_c mLookat; diff --git a/include/d/actor/d_a_npc_raca.h b/include/d/actor/d_a_npc_raca.h index 9cd1849880..187ca700c7 100644 --- a/include/d/actor/d_a_npc_raca.h +++ b/include/d/actor/d_a_npc_raca.h @@ -148,7 +148,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1]; -private: /* 0xE40 */ NPC_RACA_HIO_CLASS* mpHIO; /* 0xE44 */ dCcD_Cyl mCyl; /* 0xF80 */ u8 mType; diff --git a/include/d/actor/d_a_npc_rafrel.h b/include/d/actor/d_a_npc_rafrel.h index 3b3ac191bd..0bb9e76194 100644 --- a/include/d/actor/d_a_npc_rafrel.h +++ b/include/d/actor/d_a_npc_rafrel.h @@ -107,7 +107,6 @@ public: static DUSK_GAME_DATA int (daNpcRafrel_c::*mEvtSeqList[])(int); -private: /* 0xB48 */ Z2Creature mSound; /* 0xBD8 */ J3DModel* mpItemModel; /* 0xBDC */ daNpcF_MatAnm_c* mpMatAnm; diff --git a/include/d/actor/d_a_npc_saru.h b/include/d/actor/d_a_npc_saru.h index 7f04c509e2..dce1d7b4a3 100644 --- a/include/d/actor/d_a_npc_saru.h +++ b/include/d/actor/d_a_npc_saru.h @@ -135,7 +135,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[4]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[4]; -private: /* 0xE40 */ NPC_SARU_HIO_CLASS* mpHIO; /* 0xE44 */ J3DModel* mpRoseModels[2]; /* 0xE4C */ dCcD_Cyl field_0xe4c; diff --git a/include/d/actor/d_a_npc_seib.h b/include/d/actor/d_a_npc_seib.h index f2d0e04820..855be4ac41 100644 --- a/include/d/actor/d_a_npc_seib.h +++ b/include/d/actor/d_a_npc_seib.h @@ -87,7 +87,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1]; -private: /* 0xE40 */ NPC_SEIB_HIO_CLASS* mpHIO; /* 0xE44 */ u8 mType; /* 0xE48 */ actionFunc mActionFunc1; diff --git a/include/d/actor/d_a_npc_seic.h b/include/d/actor/d_a_npc_seic.h index 526331f05e..609d38588b 100644 --- a/include/d/actor/d_a_npc_seic.h +++ b/include/d/actor/d_a_npc_seic.h @@ -90,7 +90,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1]; -private: /* 0xE40 */ NPC_SEIC_HIO_CLASS* mpHIO; /* 0xE44 */ u8 mType; /* 0xE45 */ u8 field_0xe45[0xe48 - 0xe45]; diff --git a/include/d/actor/d_a_npc_seid.h b/include/d/actor/d_a_npc_seid.h index 37cc6302d6..91a1920598 100644 --- a/include/d/actor/d_a_npc_seid.h +++ b/include/d/actor/d_a_npc_seid.h @@ -89,7 +89,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1]; -private: /* 0xE40 */ NPC_SEID_HIO_CLASS* mpHIO; /* 0xE44 */ u8 mType; /* 0xE48 */ actionFunc mAction; diff --git a/include/d/actor/d_a_npc_seira.h b/include/d/actor/d_a_npc_seira.h index d750c70711..c4f2ef1a96 100644 --- a/include/d/actor/d_a_npc_seira.h +++ b/include/d/actor/d_a_npc_seira.h @@ -117,7 +117,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[2]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[2]; -private: /* 0x0F7C */ mDoExt_McaMorfSO* mpSeiraMorf; /* 0x0F80 */ NPC_SEIRA_HIO_CLASS* mpHIO; /* 0x0F80 */ dCcD_Cyl mCyl1; diff --git a/include/d/actor/d_a_npc_seira2.h b/include/d/actor/d_a_npc_seira2.h index 496357af4e..13aeb71e65 100644 --- a/include/d/actor/d_a_npc_seira2.h +++ b/include/d/actor/d_a_npc_seira2.h @@ -109,7 +109,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1]; -private: /* 0x0F7C */ mDoExt_McaMorfSO* mpSeiraMorf; /* 0x0F80 */ NPC_SEIRA2_HIO_CLASS* mpHIO; /* 0x0F84 */ dCcD_Cyl mCyl1; diff --git a/include/d/actor/d_a_npc_seirei.h b/include/d/actor/d_a_npc_seirei.h index a25c9671ae..b27f6084fc 100644 --- a/include/d/actor/d_a_npc_seirei.h +++ b/include/d/actor/d_a_npc_seirei.h @@ -102,7 +102,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[2]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[2]; -private: /* 0xE40 */ NPC_SEIREI_HIO_CLASS* mpHIO; /* 0xE44 */ u8 mType; /* 0xE45 */ u8 arg0; diff --git a/include/d/actor/d_a_npc_shad.h b/include/d/actor/d_a_npc_shad.h index 7f4490c183..59f1901059 100644 --- a/include/d/actor/d_a_npc_shad.h +++ b/include/d/actor/d_a_npc_shad.h @@ -237,7 +237,6 @@ public: } } -private: /* 0xB48 */ J3DModel* mBookKnifeModel; /* 0xB4C */ J3DModel* mKomonshoModel; /* 0xB50 */ Z2Creature mSound; diff --git a/include/d/actor/d_a_npc_shaman.h b/include/d/actor/d_a_npc_shaman.h index cdb7f7d7e9..1a462a7d00 100644 --- a/include/d/actor/d_a_npc_shaman.h +++ b/include/d/actor/d_a_npc_shaman.h @@ -117,7 +117,6 @@ public: static DUSK_GAME_DATA const int mSceneChangeNoTable[48]; static DUSK_GAME_DATA queryFunc mQueries[48]; -private: /* 0xE40 */ NPC_SHA_HIO_CLASS* mpHIO; /* 0xE44 */ dCcD_Cyl mCyl; /* 0xF80 */ u8 mType; diff --git a/include/d/actor/d_a_npc_shoe.h b/include/d/actor/d_a_npc_shoe.h index f9bee53132..b93259b60f 100644 --- a/include/d/actor/d_a_npc_shoe.h +++ b/include/d/actor/d_a_npc_shoe.h @@ -112,7 +112,6 @@ public: static DUSK_GAME_DATA EventFn DUSK_CONST mEvtSeqList[1]; -private: /* 0xB48 */ J3DModel* mpModel1; /* 0xB4C */ J3DModel* mpModel2; /* 0xB50 */ Z2CreatureCitizen mCreature; diff --git a/include/d/actor/d_a_npc_sola.h b/include/d/actor/d_a_npc_sola.h index bfeb993cc7..b7fff5b57b 100644 --- a/include/d/actor/d_a_npc_sola.h +++ b/include/d/actor/d_a_npc_sola.h @@ -114,7 +114,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1]; -private: /* 0xE40 */ NPC_SOLA_HIO_CLASS* mpHIO; /* 0xE44 */ dCcD_Cyl mCyl; /* 0xF80 */ u8 field_0xf80; diff --git a/include/d/actor/d_a_npc_soldierA.h b/include/d/actor/d_a_npc_soldierA.h index dfc114d97e..aaca72ec8b 100644 --- a/include/d/actor/d_a_npc_soldierA.h +++ b/include/d/actor/d_a_npc_soldierA.h @@ -82,7 +82,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList[3]; static DUSK_GAME_DATA cutFunc DUSK_CONST mEvtCutList[3]; -private: /* 0xB48 */ Z2Creature mSound; /* 0xBD8 */ J3DModel* mSpearModel; /* 0xBDC */ daNpcF_Lookat_c mLookat; diff --git a/include/d/actor/d_a_npc_soldierB.h b/include/d/actor/d_a_npc_soldierB.h index 66813628f9..d39f54edc5 100644 --- a/include/d/actor/d_a_npc_soldierB.h +++ b/include/d/actor/d_a_npc_soldierB.h @@ -78,7 +78,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList[2]; static DUSK_GAME_DATA cutFunc DUSK_CONST mEvtCutList[2]; -private: /* 0xB48 */ Z2Creature mSound; /* 0xBD8 */ J3DModel* mSpearModel; /* 0xBDC */ daNpcF_Lookat_c mLookat; diff --git a/include/d/actor/d_a_npc_taro.h b/include/d/actor/d_a_npc_taro.h index 1d0fa6274b..83ff47fc07 100644 --- a/include/d/actor/d_a_npc_taro.h +++ b/include/d/actor/d_a_npc_taro.h @@ -159,7 +159,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[17]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[17]; -private: /* 0x0E40 */ NPC_TARO_HIO_CLASS* mpHIO; /* 0x0E44 */ J3DModel* mModels[2]; /* 0x0E4C */ dCcD_Cyl mCyl1; diff --git a/include/d/actor/d_a_npc_the.h b/include/d/actor/d_a_npc_the.h index fba5678e01..2a230afb8e 100644 --- a/include/d/actor/d_a_npc_the.h +++ b/include/d/actor/d_a_npc_the.h @@ -208,7 +208,6 @@ public: } } -private: /* 0xB48 */ Z2Creature mSound; /* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm; /* 0xBDC */ daNpcF_Lookat_c mLookat; diff --git a/include/d/actor/d_a_npc_theB.h b/include/d/actor/d_a_npc_theB.h index 92e0b0b3f0..e2bc9d410d 100644 --- a/include/d/actor/d_a_npc_theB.h +++ b/include/d/actor/d_a_npc_theB.h @@ -151,7 +151,6 @@ public: static DUSK_GAME_DATA cutFunc mEvtSeqList[6]; -private: /* 0xB48 */ Z2Creature mSound; /* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm; /* 0xBDC */ daNpcF_Lookat_c mLookat; diff --git a/include/d/actor/d_a_npc_tkc.h b/include/d/actor/d_a_npc_tkc.h index 3148354b36..6ec0150e5c 100644 --- a/include/d/actor/d_a_npc_tkc.h +++ b/include/d/actor/d_a_npc_tkc.h @@ -108,7 +108,6 @@ public: static DUSK_GAME_DATA evtFunc mEvtSeqList[4]; -private: /* 0xB48 */ Z2Creature mSound; /* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm; /* 0xBDC */ daNpcF_ActorMngr_c mActorMngr[1]; diff --git a/include/d/actor/d_a_npc_tkj.h b/include/d/actor/d_a_npc_tkj.h index 8e7e2567b1..3191f1ee3b 100644 --- a/include/d/actor/d_a_npc_tkj.h +++ b/include/d/actor/d_a_npc_tkj.h @@ -97,7 +97,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[2]; static DUSK_GAME_DATA int (daNpcTkj_c::* DUSK_CONST mCutList[])(int); -private: /* 0xE40 */ NPC_TKJ_HIO_CLASS* mpHIO; /* 0xE44 */ dCcD_Cyl mCcCyl; /* 0xF80 */ u8 mType; diff --git a/include/d/actor/d_a_npc_tks.h b/include/d/actor/d_a_npc_tks.h index 0342a378fe..837a0c89ec 100644 --- a/include/d/actor/d_a_npc_tks.h +++ b/include/d/actor/d_a_npc_tks.h @@ -134,7 +134,6 @@ public: inline void playTsuboAnm(); inline int getPlayerArea(); -private: /* 0x0B48 */ Z2Creature mSound; /* 0x0BD8 */ daNpcTksTsubo_c mTksTsubo; /* 0x1160 */ daNpcF_MatAnm_c* mpMatAnm; diff --git a/include/d/actor/d_a_npc_toby.h b/include/d/actor/d_a_npc_toby.h index 4f53117112..9abb7c032f 100644 --- a/include/d/actor/d_a_npc_toby.h +++ b/include/d/actor/d_a_npc_toby.h @@ -132,7 +132,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[7]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[7]; -private: /* 0x0E40 */ NPC_TOBY_HIO_CLASS* mpHIO; /* 0x0E44 */ J3DModel* mpTobyModels[1]; /* 0x0E48 */ dCcD_Cyl mCyl1; diff --git a/include/d/actor/d_a_npc_uri.h b/include/d/actor/d_a_npc_uri.h index 78a327592a..2650de4d64 100644 --- a/include/d/actor/d_a_npc_uri.h +++ b/include/d/actor/d_a_npc_uri.h @@ -139,7 +139,6 @@ public: static DUSK_GAME_DATA const char* mCutNameList[7]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[7]; -private: /* 0x0E40 */ NPC_URI_HIO_CLASS* mpHIO; /* 0x0E44 */ J3DModel* mpModel[1]; /* 0x0E48 */ dCcD_Cyl mCyl; diff --git a/include/d/actor/d_a_npc_wrestler.h b/include/d/actor/d_a_npc_wrestler.h index b910ed50f9..c840259074 100644 --- a/include/d/actor/d_a_npc_wrestler.h +++ b/include/d/actor/d_a_npc_wrestler.h @@ -232,7 +232,6 @@ public: static DUSK_GAME_DATA EventFn DUSK_CONST mEvtSeqList[7]; -private: /* 0xB48 */ Z2Creature mSound; /* 0xBD8 */ daNpcWrestler_HIOParam* field_0xbd8; /* 0xBDC */ daNpcWrestler_HIOParamSub* field_0xbdc; diff --git a/include/d/actor/d_a_npc_yamid.h b/include/d/actor/d_a_npc_yamid.h index b175aa7a53..b9bb6bb288 100644 --- a/include/d/actor/d_a_npc_yamid.h +++ b/include/d/actor/d_a_npc_yamid.h @@ -132,7 +132,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[2]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[2]; -private: /* 0xE40 */ NPC_YAMID_HIO_CLASS* mpHIO; /* 0xE44 */ dCcD_Cyl field_0xe44; /* 0xF80 */ u8 mType; diff --git a/include/d/actor/d_a_npc_yamis.h b/include/d/actor/d_a_npc_yamis.h index 4c23311c5e..272b0d5b72 100644 --- a/include/d/actor/d_a_npc_yamis.h +++ b/include/d/actor/d_a_npc_yamis.h @@ -127,7 +127,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[2]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[2]; -private: /* 0xE40 */ NPC_YAMIS_HIO_CLASS* mpHIO; /* 0xE44 */ dCcD_Cyl field_0xe44; /* 0xF80 */ u8 mType; diff --git a/include/d/actor/d_a_npc_yamit.h b/include/d/actor/d_a_npc_yamit.h index a59b6a841f..0a12c2875d 100644 --- a/include/d/actor/d_a_npc_yamit.h +++ b/include/d/actor/d_a_npc_yamit.h @@ -126,7 +126,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[2]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[2]; -private: /* 0xE40 */ NPC_YAMIT_HIO_CLASS* mpHIO; /* 0xE44 */ dCcD_Cyl field_0xe44; /* 0xF80 */ u8 mType; diff --git a/include/d/actor/d_a_npc_yelia.h b/include/d/actor/d_a_npc_yelia.h index 737a3b4e28..c86d8e6ac6 100644 --- a/include/d/actor/d_a_npc_yelia.h +++ b/include/d/actor/d_a_npc_yelia.h @@ -104,7 +104,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[6]; static DUSK_GAME_DATA int (daNpc_Yelia_c::*mCutList[6])(int); -private: /* 0xE40 */ NPC_YELIA_HIO_CLASS* mpHIO; /* 0xE44 */ dCcD_Cyl mCcCyl; /* 0xF80 */ u8 mType; diff --git a/include/d/actor/d_a_npc_ykm.h b/include/d/actor/d_a_npc_ykm.h index 5ad9e7210b..5bbb5077f6 100644 --- a/include/d/actor/d_a_npc_ykm.h +++ b/include/d/actor/d_a_npc_ykm.h @@ -287,7 +287,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[10]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[10]; -// private: /* 0x0E40 */ mDoExt_McaMorfSO* mFishModelMorf; /* 0x0E44 */ mDoExt_McaMorfSO* mLeafModelMorf; /* 0x0E48 */ NPC_YKM_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_zanb.h b/include/d/actor/d_a_npc_zanb.h index 51d99c8253..78c37f6c76 100644 --- a/include/d/actor/d_a_npc_zanb.h +++ b/include/d/actor/d_a_npc_zanb.h @@ -102,7 +102,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1]; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1]; -private: /* 0xE40 */ NPC_ZANB_HIO_CLASS* mHIO; /* 0xE44 */ dCcD_Cyl mCyl; /* 0xF80 */ u8 mType; diff --git a/include/d/actor/d_a_npc_zant.h b/include/d/actor/d_a_npc_zant.h index cbd33863d2..f9cd1c5b9b 100644 --- a/include/d/actor/d_a_npc_zant.h +++ b/include/d/actor/d_a_npc_zant.h @@ -86,7 +86,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1]; -private: /* 0xE40 */ NPC_ZANT_HIO_CLASS* mpHIO; /* 0xE44 */ dCcD_Cyl mCyl; /* 0xF80 */ u8 mType; diff --git a/include/d/actor/d_a_npc_zelR.h b/include/d/actor/d_a_npc_zelR.h index e7810c850c..bfe7d963a0 100644 --- a/include/d/actor/d_a_npc_zelR.h +++ b/include/d/actor/d_a_npc_zelR.h @@ -96,7 +96,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList; static DUSK_GAME_DATA EventFn mCutList[1]; -private: /* 0xE40 */ NPC_ZELR_HIO_CLASS* mpHIO; /* 0xE44 */ dCcD_Cyl mCyl; /* 0xF80 */ u8 mType; diff --git a/include/d/actor/d_a_npc_zelRo.h b/include/d/actor/d_a_npc_zelRo.h index b3e2533999..a57235bff9 100644 --- a/include/d/actor/d_a_npc_zelRo.h +++ b/include/d/actor/d_a_npc_zelRo.h @@ -150,7 +150,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1]; -private: /* 0xE40 */ NPC_ZELRO_HIO_CLASS* mpHIO; /* 0xE44 */ dCcD_Cyl mCyl; /* 0xF80 */ u8 mType; diff --git a/include/d/actor/d_a_npc_zelda.h b/include/d/actor/d_a_npc_zelda.h index 6c3da5a2b3..e4be31296e 100644 --- a/include/d/actor/d_a_npc_zelda.h +++ b/include/d/actor/d_a_npc_zelda.h @@ -103,7 +103,6 @@ public: static DUSK_GAME_DATA const char* mCutNameList; static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1]; -private: /* 0xE40 */ NPC_ZELDA_HIO_CLASS* mpHIO; /* 0xE44 */ dCcD_Cyl mCyl; /* 0xF80 */ u8 field_0xf80; diff --git a/include/d/actor/d_a_npc_zrc.h b/include/d/actor/d_a_npc_zrc.h index 6f6a00061b..e9992ae157 100644 --- a/include/d/actor/d_a_npc_zrc.h +++ b/include/d/actor/d_a_npc_zrc.h @@ -96,7 +96,6 @@ public: static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList[2]; static DUSK_GAME_DATA EventFn DUSK_CONST mEvtCutList[2]; -// private: /* 0xB48 */ Z2Creature mCreatureSound; /* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm; /* 0xBDC */ daNpcF_Lookat_c mLookat; diff --git a/include/d/actor/d_a_npc_zrz.h b/include/d/actor/d_a_npc_zrz.h index 9e03215aa4..a02ebb8227 100644 --- a/include/d/actor/d_a_npc_zrz.h +++ b/include/d/actor/d_a_npc_zrz.h @@ -114,7 +114,6 @@ public: void himoCalc(); void adjustShapeAngle() {} -// private: /* 0x0B48 */ Z2Creature mCreatureSound; /* 0x0BD8 */ daNpcF_MatAnm_c* mpMatAnm; /* 0x0BDC */ mDoExt_invisibleModel mInvisibleModel; diff --git a/include/d/actor/d_a_obj_Lv5Key.h b/include/d/actor/d_a_obj_Lv5Key.h index 6e0251b151..11e2bd3019 100644 --- a/include/d/actor/d_a_obj_Lv5Key.h +++ b/include/d/actor/d_a_obj_Lv5Key.h @@ -65,7 +65,6 @@ public: cXyz& getLocalOffset() { return mLocalOffset; } -private: /* 0x568 */ u8 field_0x568[0x56C - 0x568]; /* 0x56C */ Z2SoundObjSimple mSound; /* 0x58C */ u8 field_0x58C[0x590 - 0x58C]; diff --git a/include/d/actor/d_a_obj_Turara.h b/include/d/actor/d_a_obj_Turara.h index 99d5a3a245..16f27d8550 100644 --- a/include/d/actor/d_a_obj_Turara.h +++ b/include/d/actor/d_a_obj_Turara.h @@ -56,7 +56,6 @@ public: static DUSK_GAME_DATA const dCcD_SrcGObjInf mCcDObjInfo; static DUSK_GAME_DATA dCcD_SrcCyl mCcDCyl; -private: /* 0x5b8 */ request_of_phase_process_class mPhaseReq; /* 0x5c0 */ J3DModel* mpModel[2]; /* 0x5c8 */ u8 mMode; diff --git a/include/d/actor/d_a_obj_TvCdlst.h b/include/d/actor/d_a_obj_TvCdlst.h index afe204bc03..5329727f6a 100644 --- a/include/d/actor/d_a_obj_TvCdlst.h +++ b/include/d/actor/d_a_obj_TvCdlst.h @@ -33,7 +33,6 @@ public: u8 getOnSw() { return fopAcM_GetParamBit(this,0,8); } u8 getOffSw() { return fopAcM_GetParamBit(this,0x10,8); } -private: /* 0x568 */ request_of_phase_process_class mPhaseReq; /* 0x570 */ J3DModel* mpModel; /* 0x574 */ dCcD_Stts mStts; diff --git a/include/d/actor/d_a_obj_Y_taihou.h b/include/d/actor/d_a_obj_Y_taihou.h index 0e96cf62ed..002b85d853 100644 --- a/include/d/actor/d_a_obj_Y_taihou.h +++ b/include/d/actor/d_a_obj_Y_taihou.h @@ -37,7 +37,6 @@ public: s32 getIronBallId() { return mIronBallId; } void startBomb() { mStartBomb = 0xffff; } -private: /* 0x5b8 */ Mtx mMtx; /* 0x5e8 */ J3DModel* mpModel; /* 0x5ec */ dCcD_Stts mStts; diff --git a/include/d/actor/d_a_obj_amiShutter.h b/include/d/actor/d_a_obj_amiShutter.h index b0e881c4c0..9fabc75220 100644 --- a/include/d/actor/d_a_obj_amiShutter.h +++ b/include/d/actor/d_a_obj_amiShutter.h @@ -62,7 +62,6 @@ public: bool isShutterOpen() { return mOpen; } -private: /* 0x5b8 */ request_of_phase_process_class mPhaseReq; /* 0x5c0 */ J3DModel* mpModel; /* 0x5c4 */ u8 mMode; diff --git a/include/d/actor/d_a_obj_ari.h b/include/d/actor/d_a_obj_ari.h index a771b054f1..03b80016bd 100644 --- a/include/d/actor/d_a_obj_ari.h +++ b/include/d/actor/d_a_obj_ari.h @@ -40,7 +40,6 @@ public: bool CreateChk(); cPhs_Step create(); -private: /* 0x590 */ dBgS_GndChk mGndChk; /* 0x5E4 */ u8 field_0x5e4[4]; /* 0x5E8 */ u8 mAction; diff --git a/include/d/actor/d_a_obj_automata.h b/include/d/actor/d_a_obj_automata.h index 95fec65cff..17e470af99 100644 --- a/include/d/actor/d_a_obj_automata.h +++ b/include/d/actor/d_a_obj_automata.h @@ -44,7 +44,7 @@ public: * */ class daObj_AutoMata_c : public fopAc_ac_c { -private: +public: /* 0x568 */ OBJ_AUTOMATA_HIO_CLASS* mpHIO; /* 0x56C */ mDoExt_McaMorfSO* mpMorf; /* 0x570 */ Z2Creature mCreature; diff --git a/include/d/actor/d_a_obj_avalanche.h b/include/d/actor/d_a_obj_avalanche.h index 89de60d2e8..ef72babdef 100644 --- a/include/d/actor/d_a_obj_avalanche.h +++ b/include/d/actor/d_a_obj_avalanche.h @@ -46,7 +46,6 @@ public: u8 getEvId() { return fopAcM_GetParamBit(this, 8, 8); } void setAction(u8 action) { mAction = action; } -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mModel; /* 0x5AC */ mDoExt_bckAnm* mBckAnm; diff --git a/include/d/actor/d_a_obj_batta.h b/include/d/actor/d_a_obj_batta.h index fca663390b..a1eaefc45e 100644 --- a/include/d/actor/d_a_obj_batta.h +++ b/include/d/actor/d_a_obj_batta.h @@ -43,7 +43,6 @@ public: return mActionFunc == i_func; } -private: /* 0x590 */ Z2Creature mCreature; /* 0x620 */ mDoExt_McaMorfSO* mpMorf; /* 0x624 */ mDoExt_brkAnm* mBrk; diff --git a/include/d/actor/d_a_obj_bbox.h b/include/d/actor/d_a_obj_bbox.h index 7ee461b557..1f7c2eef60 100644 --- a/include/d/actor/d_a_obj_bbox.h +++ b/include/d/actor/d_a_obj_bbox.h @@ -26,7 +26,6 @@ public: u32 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); } -private: /* 0x5A0 */ request_of_phase_process_class mPhaseReq; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ dCcD_Stts mStts; diff --git a/include/d/actor/d_a_obj_bemos.h b/include/d/actor/d_a_obj_bemos.h index 38501b708b..3d0c10790d 100644 --- a/include/d/actor/d_a_obj_bemos.h +++ b/include/d/actor/d_a_obj_bemos.h @@ -131,7 +131,6 @@ public: int Delete(); static DUSK_GAME_DATA s16 const M_dir_base[4]; - // private: /* 0x05A0 */ request_of_phase_process_class mPhase; /* 0x05A8 */ J3DModel* mpModel; /* 0x05AC */ mDoExt_brkAnm* mSerchBrk; diff --git a/include/d/actor/d_a_obj_bhashi.h b/include/d/actor/d_a_obj_bhashi.h index 7600d73f67..7ce2cd1c23 100644 --- a/include/d/actor/d_a_obj_bhashi.h +++ b/include/d/actor/d_a_obj_bhashi.h @@ -50,7 +50,6 @@ public: virtual int Draw(); virtual int Delete(); -private: /* 0x05A0 */ u8 field_0x5A0[0x05A4 - 0x05A0]; /* 0x05A4 */ int mMode; /* 0x05A8 */ s16 field_0x5a8; diff --git a/include/d/actor/d_a_obj_bkdoor.h b/include/d/actor/d_a_obj_bkdoor.h index 69d3191028..793d86f09c 100644 --- a/include/d/actor/d_a_obj_bkdoor.h +++ b/include/d/actor/d_a_obj_bkdoor.h @@ -26,7 +26,6 @@ public: virtual int Draw(); virtual int Delete(); -private: /* 0x5A0 */ request_of_phase_process_class mPhaseReq; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ csXyz mRotation; diff --git a/include/d/actor/d_a_obj_bky_rock.h b/include/d/actor/d_a_obj_bky_rock.h index 1f5952c35e..1214a610c9 100644 --- a/include/d/actor/d_a_obj_bky_rock.h +++ b/include/d/actor/d_a_obj_bky_rock.h @@ -63,7 +63,6 @@ public: static DUSK_GAME_DATA dCcD_SrcCyl const s_CcDCyl; static DUSK_GAME_DATA exeProc s_exeProc[3]; -private: /* 0x568 */ int mVibrationTimer; /* 0x578 */ u8 mMode; /* 0x579 */ bool field_0x579; diff --git a/include/d/actor/d_a_obj_bmWindow.h b/include/d/actor/d_a_obj_bmWindow.h index 161f4768a9..a3d71fa9c2 100644 --- a/include/d/actor/d_a_obj_bmWindow.h +++ b/include/d/actor/d_a_obj_bmWindow.h @@ -39,7 +39,6 @@ public: int Draw(); int Delete(); -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mModel; /* 0x5AC */ u8 mMode; diff --git a/include/d/actor/d_a_obj_bmshutter.h b/include/d/actor/d_a_obj_bmshutter.h index c114421fe8..6ca4c05fe9 100644 --- a/include/d/actor/d_a_obj_bmshutter.h +++ b/include/d/actor/d_a_obj_bmshutter.h @@ -46,7 +46,6 @@ public: void setAction(u8 action) { mAction = action; } void setMoveMode(u8 mode) { mMoveMode = mode; } -private: /* 0x5a0 */ request_of_phase_process_class mPhase; /* 0x5a8 */ J3DModel* mModel; /* 0x5ac */ s16 mEventIdx; diff --git a/include/d/actor/d_a_obj_bombf.h b/include/d/actor/d_a_obj_bombf.h index 1d175caa94..661450e397 100644 --- a/include/d/actor/d_a_obj_bombf.h +++ b/include/d/actor/d_a_obj_bombf.h @@ -21,7 +21,6 @@ public: int execute(); int draw(); -private: /* 0x568 */ request_of_phase_process_class field_0x568; /* 0x570 */ J3DModel* field_0x570; /* 0x574 */ u32 field_0x574; diff --git a/include/d/actor/d_a_obj_bosswarp.h b/include/d/actor/d_a_obj_bosswarp.h index 71b5b2b58f..4f6c6e4282 100644 --- a/include/d/actor/d_a_obj_bosswarp.h +++ b/include/d/actor/d_a_obj_bosswarp.h @@ -60,7 +60,6 @@ public: 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]; diff --git a/include/d/actor/d_a_obj_boumato.h b/include/d/actor/d_a_obj_boumato.h index 4852aee6f9..6a0266e548 100644 --- a/include/d/actor/d_a_obj_boumato.h +++ b/include/d/actor/d_a_obj_boumato.h @@ -50,7 +50,7 @@ public: * */ class daObj_BouMato_c : public fopAc_ac_c { -private: +public: /* 0x568 */ OBJ_BOUMATO_HIO_CLASS* mpHIO; /* 0x56C */ request_of_phase_process_class mPhase; /* 0x574 */ J3DModel* mModel; diff --git a/include/d/actor/d_a_obj_bsGate.h b/include/d/actor/d_a_obj_bsGate.h index b40c5dcf6d..0c9730d63d 100644 --- a/include/d/actor/d_a_obj_bsGate.h +++ b/include/d/actor/d_a_obj_bsGate.h @@ -35,7 +35,6 @@ public: int Draw(); int Delete(); -private: /* 0x5A0 */ request_of_phase_process_class mPhaseReq; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ u8 mMode; diff --git a/include/d/actor/d_a_obj_bubblePilar.h b/include/d/actor/d_a_obj_bubblePilar.h index 7fb8009564..e19cbbae2f 100644 --- a/include/d/actor/d_a_obj_bubblePilar.h +++ b/include/d/actor/d_a_obj_bubblePilar.h @@ -39,7 +39,6 @@ public: static DUSK_GAME_DATA dCcD_SrcGObjInf const mCcDObjInfo; static DUSK_GAME_DATA dCcD_SrcCyl mCcDCyl; -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mModels[2]; /* 0x5B0 */ dCcD_Stts mStts; diff --git a/include/d/actor/d_a_obj_burnbox.h b/include/d/actor/d_a_obj_burnbox.h index f87678dccc..dc4634ea85 100644 --- a/include/d/actor/d_a_obj_burnbox.h +++ b/include/d/actor/d_a_obj_burnbox.h @@ -28,7 +28,6 @@ public: u8 getType() { return fopAcM_GetParamBit(this, 0, 8); } -private: /* 0x5A0 */ request_of_phase_process_class mPhaseReq; /* 0x5A8 */ J3DModel* mpBoxModel; /* 0x5AC */ dCcD_Stts mStts; diff --git a/include/d/actor/d_a_obj_carry.h b/include/d/actor/d_a_obj_carry.h index 8147cbfb60..54c8c73043 100644 --- a/include/d/actor/d_a_obj_carry.h +++ b/include/d/actor/d_a_obj_carry.h @@ -407,7 +407,6 @@ public: /* 0xE26 */ u8 field_0xe26; /* 0xE27 */ u8 field_0xe27; -private: u16 getType_private() { return field_0xd18 >> 1 & 0x1f; } }; diff --git a/include/d/actor/d_a_obj_catdoor.h b/include/d/actor/d_a_obj_catdoor.h index b7ed95bd14..c352c25806 100644 --- a/include/d/actor/d_a_obj_catdoor.h +++ b/include/d/actor/d_a_obj_catdoor.h @@ -80,7 +80,6 @@ public: Z2GetAudioMgr()->seStart(Z2SE_OBJ_GZ_NE_DOOR_OP, ¤t.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); } -private: /* 0x568 */ request_of_phase_process_class mPhaseReq; /* 0x570 */ daObjCatDoor_Door_c mDoor1; /* 0x660 */ daObjCatDoor_Door_c mDoor2; diff --git a/include/d/actor/d_a_obj_cblock.h b/include/d/actor/d_a_obj_cblock.h index 04881776ec..75454ebb5d 100644 --- a/include/d/actor/d_a_obj_cblock.h +++ b/include/d/actor/d_a_obj_cblock.h @@ -49,7 +49,6 @@ public: u8 getSwNo() { return fopAcM_GetParamBit(this, 16, 8); } u8 getPathID() { return fopAcM_GetParamBit(this, 24, 8); } -private: /* 0x5A0 */ request_of_phase_process_class phase; /* 0x5A8 */ J3DModel* model1; /* 0x5AC */ J3DModel* model2; diff --git a/include/d/actor/d_a_obj_cboard.h b/include/d/actor/d_a_obj_cboard.h index 52a5f753e4..9bcdb51ed5 100644 --- a/include/d/actor/d_a_obj_cboard.h +++ b/include/d/actor/d_a_obj_cboard.h @@ -28,7 +28,6 @@ public: u8 getArg0() { return fopAcM_GetParamBit(this, 4, 4); } u8 getSwNo() { return fopAcM_GetParamBit(this, 8, 8); } -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ Mtx field_0x5a8; }; diff --git a/include/d/actor/d_a_obj_cdoor.h b/include/d/actor/d_a_obj_cdoor.h index ee06fd790c..60d54539e9 100644 --- a/include/d/actor/d_a_obj_cdoor.h +++ b/include/d/actor/d_a_obj_cdoor.h @@ -51,7 +51,6 @@ public: 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/d/actor/d_a_obj_chandelier.h b/include/d/actor/d_a_obj_chandelier.h index 45158dea34..a0592f4374 100644 --- a/include/d/actor/d_a_obj_chandelier.h +++ b/include/d/actor/d_a_obj_chandelier.h @@ -49,7 +49,6 @@ public: void moveHookOn() { field_0x60a = 1; } -private: /* 0x5A8 */ cXyz field_0x5a8; /* 0x5B4 */ Mtx mMtx; /* 0x5E4 */ u8 field_0x5e4[4]; diff --git a/include/d/actor/d_a_obj_chest.h b/include/d/actor/d_a_obj_chest.h index a5caedae86..e225c4a254 100644 --- a/include/d/actor/d_a_obj_chest.h +++ b/include/d/actor/d_a_obj_chest.h @@ -39,7 +39,6 @@ public: 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; diff --git a/include/d/actor/d_a_obj_cho.h b/include/d/actor/d_a_obj_cho.h index 49dd5332b1..adb3faef58 100644 --- a/include/d/actor/d_a_obj_cho.h +++ b/include/d/actor/d_a_obj_cho.h @@ -46,7 +46,6 @@ public: cPhs_Step create(); inline int Draw(); -private: /* 0x590 */ dBgS_AcchCir mAcchCir; /* 0x5D0 */ dBgS_ObjAcch mAcch; /* 0x7A8 */ dCcD_Stts mCcStts; diff --git a/include/d/actor/d_a_obj_cowdoor.h b/include/d/actor/d_a_obj_cowdoor.h index 1ed34370d8..a084ca0188 100644 --- a/include/d/actor/d_a_obj_cowdoor.h +++ b/include/d/actor/d_a_obj_cowdoor.h @@ -22,7 +22,6 @@ public: int Draw(); int Delete(); -private: /* 0x5A0 */ request_of_phase_process_class field_0x5a0; /* 0x5A8 */ J3DModel* field_0x5a8; }; diff --git a/include/d/actor/d_a_obj_crope.h b/include/d/actor/d_a_obj_crope.h index bde25e379c..e0f0220000 100644 --- a/include/d/actor/d_a_obj_crope.h +++ b/include/d/actor/d_a_obj_crope.h @@ -52,7 +52,6 @@ public: mCoCancelTimer = 30; } -private: /* 0x0568 */ request_of_phase_process_class mPhase; /* 0x0570 */ dCcD_Stts mCcStts; /* 0x05AC */ dCcD_Sph mCollider; diff --git a/include/d/actor/d_a_obj_crvfence.h b/include/d/actor/d_a_obj_crvfence.h index dd760bb43f..9b6298553f 100644 --- a/include/d/actor/d_a_obj_crvfence.h +++ b/include/d/actor/d_a_obj_crvfence.h @@ -34,7 +34,6 @@ public: int Draw(); int Delete(); -private: /* 0x05A0 */ int field_0x5a0; /* 0x05A4 */ int mAction; /* 0x05A8 */ u8 field_0x5a8; diff --git a/include/d/actor/d_a_obj_crvgate.h b/include/d/actor/d_a_obj_crvgate.h index 1fb4d1a12b..fed7868085 100644 --- a/include/d/actor/d_a_obj_crvgate.h +++ b/include/d/actor/d_a_obj_crvgate.h @@ -50,7 +50,6 @@ public: int Draw(); int Delete(); -private: /* 0x5A0 */ s32 mEventID; /* 0x5A4 */ bool mFlagGateClosed; /* 0x5A5 */ bool field_0x5a5; diff --git a/include/d/actor/d_a_obj_crvlh_down.h b/include/d/actor/d_a_obj_crvlh_down.h index ce1c31bfa8..06ad6c89f0 100644 --- a/include/d/actor/d_a_obj_crvlh_down.h +++ b/include/d/actor/d_a_obj_crvlh_down.h @@ -28,7 +28,6 @@ public: virtual int Draw(); virtual int Delete(); -private: /* 0x5A0 */ fpc_ProcID field_0x5a0; /* 0x5A4 */ fpc_ProcID field_0x5a4; /* 0x5A8 */ cXyz field_0x5a8; diff --git a/include/d/actor/d_a_obj_crvlh_up.h b/include/d/actor/d_a_obj_crvlh_up.h index 7f24ba03a6..950018311a 100644 --- a/include/d/actor/d_a_obj_crvlh_up.h +++ b/include/d/actor/d_a_obj_crvlh_up.h @@ -26,7 +26,6 @@ public: virtual int Draw(); virtual int Delete(); -private: /* 0x568 */ u8 field_0x568[0x5a4 - 0x5a0]; /* 0x5A4 */ fpc_ProcID field_0x5a4; /* 0x5A8 */ fpc_ProcID field_0x5a8; diff --git a/include/d/actor/d_a_obj_crvsteel.h b/include/d/actor/d_a_obj_crvsteel.h index a8d6305495..09ddc5be2a 100644 --- a/include/d/actor/d_a_obj_crvsteel.h +++ b/include/d/actor/d_a_obj_crvsteel.h @@ -29,7 +29,6 @@ public: int Draw(); int Delete(); -private: /* 0x5A0 */ u32 mSmokeParticle1; /* 0x5A4 */ u32 mSmokeParticle2; /* 0x5A8 */ s16 mAction; diff --git a/include/d/actor/d_a_obj_crystal.h b/include/d/actor/d_a_obj_crystal.h index 0d6fcc1fc6..3c2fbfb110 100644 --- a/include/d/actor/d_a_obj_crystal.h +++ b/include/d/actor/d_a_obj_crystal.h @@ -22,7 +22,6 @@ public: int draw(); int _delete(); -private: /* 0x568 */ request_of_phase_process_class mPhase; /* 0x570 */ J3DModel* mpModel[2]; /* 0x578 */ JPABaseEmitter* mpEmitter; diff --git a/include/d/actor/d_a_obj_cwall.h b/include/d/actor/d_a_obj_cwall.h index 396729be80..66d760a337 100644 --- a/include/d/actor/d_a_obj_cwall.h +++ b/include/d/actor/d_a_obj_cwall.h @@ -61,7 +61,6 @@ public: u8 getType() { return fopAcM_GetParamBit(this, 4, 4); } u8 getSwbit() { return fopAcM_GetParamBit(this, 8, 8); } -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mWallModel; /* 0x5AC */ dCcD_Stts mStts; diff --git a/include/d/actor/d_a_obj_damCps.h b/include/d/actor/d_a_obj_damCps.h index 1ce75cc663..d92a38184c 100644 --- a/include/d/actor/d_a_obj_damCps.h +++ b/include/d/actor/d_a_obj_damCps.h @@ -26,7 +26,6 @@ public: int _delete(); u8 getSwNo(); -private: /* 0x0570 */ dCcD_Stts mStts; /* 0x05AC */ dCcD_Cps mCps; /* 0x06F0 */ cM3dGCpsS mCapsule; diff --git a/include/d/actor/d_a_obj_dan.h b/include/d/actor/d_a_obj_dan.h index 15caef361a..3e3b62fc9b 100644 --- a/include/d/actor/d_a_obj_dan.h +++ b/include/d/actor/d_a_obj_dan.h @@ -39,7 +39,6 @@ public: bool CreateChk(); cPhs_Step create(); -private: /* 0x590 */ dCcD_Stts mCcStts; /* 0x5CC */ dCcD_Sph mCcSph; /* 0x704 */ daPy_boomerangMove_c mBoomerangMove; diff --git a/include/d/actor/d_a_obj_digholl.h b/include/d/actor/d_a_obj_digholl.h index 33f078a1ea..f985bbe165 100644 --- a/include/d/actor/d_a_obj_digholl.h +++ b/include/d/actor/d_a_obj_digholl.h @@ -21,7 +21,6 @@ public: void onDigStart() { field_0x568 = 1; } s16 getSceneNum() const { return field_0x56c; } -private: /* 0x568 */ u8 field_0x568; /* 0x569 */ u8 field_0x569; /* 0x56A */ u8 field_0x56a; diff --git a/include/d/actor/d_a_obj_digplace.h b/include/d/actor/d_a_obj_digplace.h index 404b35aff4..0b29ff11f6 100644 --- a/include/d/actor/d_a_obj_digplace.h +++ b/include/d/actor/d_a_obj_digplace.h @@ -17,7 +17,6 @@ public: int create(); int execute(); -private: /* 0x568 */ u8 mType; /* 0x569 */ u8 mSwitch; /* 0x56A */ u8 mDigFlg; diff --git a/include/d/actor/d_a_obj_digsnow.h b/include/d/actor/d_a_obj_digsnow.h index 09af66d091..4ef3de5958 100644 --- a/include/d/actor/d_a_obj_digsnow.h +++ b/include/d/actor/d_a_obj_digsnow.h @@ -50,7 +50,6 @@ public: void startDig() { mMode = ACTION_DIG_e; } void endDig() { mMode = ACTION_END_e; } -private: /* 0x5A0 */ request_of_phase_process_class mPhaseReq; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ dBgS_ObjAcch mAcch; diff --git a/include/d/actor/d_a_obj_enemy_create.h b/include/d/actor/d_a_obj_enemy_create.h index 3b29caddab..64da7b5203 100644 --- a/include/d/actor/d_a_obj_enemy_create.h +++ b/include/d/actor/d_a_obj_enemy_create.h @@ -22,7 +22,6 @@ public: void NameChk(); int create(); -private: /* 0x568 */ u8 field_0x568; /* 0x569 */ u8 mEnemyNum; /* 0x56A */ u8 mActivateSw; diff --git a/include/d/actor/d_a_obj_fallobj.h b/include/d/actor/d_a_obj_fallobj.h index 0c4efed3f3..f59a58991a 100644 --- a/include/d/actor/d_a_obj_fallobj.h +++ b/include/d/actor/d_a_obj_fallobj.h @@ -50,7 +50,6 @@ public: return this->speed.y != 0.0f; }; -private: /* 0x5A0 */ request_of_phase_process_class mPhaseReq; /* 0x5A8 */ Mtx mMtx; /* 0x5D8 */ u8 field_0x5d8; diff --git a/include/d/actor/d_a_obj_fan.h b/include/d/actor/d_a_obj_fan.h index 1ababac7a6..a4907c01a1 100644 --- a/include/d/actor/d_a_obj_fan.h +++ b/include/d/actor/d_a_obj_fan.h @@ -29,7 +29,6 @@ public: u8 getType() { return fopAcM_GetParamBit(this,0,4); } -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mModel; /* 0x5AC */ dBgW* field_0x5ac; diff --git a/include/d/actor/d_a_obj_fchain.h b/include/d/actor/d_a_obj_fchain.h index 7c4ae74faf..80e96f097b 100644 --- a/include/d/actor/d_a_obj_fchain.h +++ b/include/d/actor/d_a_obj_fchain.h @@ -35,7 +35,6 @@ public: void onInterpCallback(); #endif -private: /* 0x568 */ request_of_phase_process_class mPhase; /* 0x570 */ J3DModelData* mModelData; /* 0x574 */ daObjFchain_shape_c mShape; diff --git a/include/d/actor/d_a_obj_fireWood.h b/include/d/actor/d_a_obj_fireWood.h index 07a5d5334b..5ce85234de 100644 --- a/include/d/actor/d_a_obj_fireWood.h +++ b/include/d/actor/d_a_obj_fireWood.h @@ -27,7 +27,6 @@ public: static DUSK_GAME_DATA const dCcD_SrcGObjInf mCcDObjInfo; static DUSK_GAME_DATA dCcD_SrcCyl mCcDCyl; -private: /* 0x568 */ u8 field_0x568[0x574 - 0x568]; /* 0x574 */ dCcD_Stts mCcStts; /* 0x5B0 */ dCcD_Cyl mCcCyl; diff --git a/include/d/actor/d_a_obj_fireWood2.h b/include/d/actor/d_a_obj_fireWood2.h index bcb1bee95d..209ccf8ffd 100644 --- a/include/d/actor/d_a_obj_fireWood2.h +++ b/include/d/actor/d_a_obj_fireWood2.h @@ -28,7 +28,6 @@ public: static DUSK_GAME_DATA const dCcD_SrcGObjInf mCcDObjInfo; static DUSK_GAME_DATA dCcD_SrcCyl mCcDCyl; -private: /* 0x568 */ u8 field_0x568[0x574 - 0x568]; /* 0x574 */ dCcD_Stts mCcStts; /* 0x5B0 */ dCcD_Cyl mCcCyl; diff --git a/include/d/actor/d_a_obj_firepillar.h b/include/d/actor/d_a_obj_firepillar.h index 620373422a..8490a1c488 100644 --- a/include/d/actor/d_a_obj_firepillar.h +++ b/include/d/actor/d_a_obj_firepillar.h @@ -47,7 +47,6 @@ public: int draw(); int _delete(); -private: /* 0x568 */ request_of_phase_process_class mPhase; /* 0x570 */ int field_0x570; /* 0x574 */ dBgS_ObjAcch mAcch; diff --git a/include/d/actor/d_a_obj_firepillar2.h b/include/d/actor/d_a_obj_firepillar2.h index 359cbf6bb3..579342b8dc 100644 --- a/include/d/actor/d_a_obj_firepillar2.h +++ b/include/d/actor/d_a_obj_firepillar2.h @@ -51,7 +51,6 @@ public: u8 getArg0() { return fopAcM_GetParamBit(this,8,8); } u8 getSwNo() { return fopAcM_GetParamBit(this,0,8); } -private: /* 0x568 */ request_of_phase_process_class mPhase; /* 0x570 */ J3DModel* mModel; /* 0x574 */ mDoExt_bckAnm* mBck; diff --git a/include/d/actor/d_a_obj_flag.h b/include/d/actor/d_a_obj_flag.h index 8187fe33b2..8ac8662fb9 100644 --- a/include/d/actor/d_a_obj_flag.h +++ b/include/d/actor/d_a_obj_flag.h @@ -28,7 +28,7 @@ public: * */ class daObjFlag_c : public fopAc_ac_c { -private: +public: /* 0x568 */ J3DModel* mpModel1; /* 0x56c */ J3DModel* mpModel2; /* 0x570 */ request_of_phase_process_class mPhase; diff --git a/include/d/actor/d_a_obj_flag2.h b/include/d/actor/d_a_obj_flag2.h index c9ef033190..676da2141d 100644 --- a/include/d/actor/d_a_obj_flag2.h +++ b/include/d/actor/d_a_obj_flag2.h @@ -83,7 +83,6 @@ public: static DUSK_GAME_DATA daObjFlag2_Attr_c const M_attr; -private: /* 0x0568 */ J3DModel* mModel; /* 0x056C */ request_of_phase_process_class mFlagPhase; /* 0x0574 */ request_of_phase_process_class mArcPhase; diff --git a/include/d/actor/d_a_obj_flag3.h b/include/d/actor/d_a_obj_flag3.h index b93394ce15..26bfd5b506 100644 --- a/include/d/actor/d_a_obj_flag3.h +++ b/include/d/actor/d_a_obj_flag3.h @@ -96,7 +96,6 @@ public: static DUSK_GAME_DATA daObjFlag3_Attr_c const M_attr; const daObjFlag3_Attr_c& attr() const { return M_attr; } -private: /* 0x0568 */ J3DModel* mModel; /* 0x056C */ request_of_phase_process_class mFlagPhase; /* 0x0574 */ request_of_phase_process_class mArcPhase; diff --git a/include/d/actor/d_a_obj_gadget.h b/include/d/actor/d_a_obj_gadget.h index cb2c99af97..a52f9ab27b 100644 --- a/include/d/actor/d_a_obj_gadget.h +++ b/include/d/actor/d_a_obj_gadget.h @@ -17,7 +17,7 @@ class daObj_Gadget_HIO_c; * */ class daObj_Gadget_c : public fopAc_ac_c { -private: +public: /* 0x568 */ daObj_Gadget_HIO_c* field_0x568; /* 0x56C */ request_of_phase_process_class mPhase; /* 0x574 */ J3DModel* mModel; diff --git a/include/d/actor/d_a_obj_ganonwall.h b/include/d/actor/d_a_obj_ganonwall.h index 02d0cd1d99..c5e6f7d06a 100644 --- a/include/d/actor/d_a_obj_ganonwall.h +++ b/include/d/actor/d_a_obj_ganonwall.h @@ -26,7 +26,6 @@ public: 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; diff --git a/include/d/actor/d_a_obj_ganonwall2.h b/include/d/actor/d_a_obj_ganonwall2.h index a938a32141..0026094a8d 100644 --- a/include/d/actor/d_a_obj_ganonwall2.h +++ b/include/d/actor/d_a_obj_ganonwall2.h @@ -25,7 +25,6 @@ public: u32 getEventBit1() { return fopAcM_GetParamBit(this, 0, 10); } -private: /* 0x5A0 */ request_of_phase_process_class mPhaseReq; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ mDoExt_btkAnm* mpBtkAnm; diff --git a/include/d/actor/d_a_obj_geyser.h b/include/d/actor/d_a_obj_geyser.h index 54a7f3bcb8..244d3b1fcf 100644 --- a/include/d/actor/d_a_obj_geyser.h +++ b/include/d/actor/d_a_obj_geyser.h @@ -62,7 +62,6 @@ public: u8 getArg3() { return fopAcM_GetParamBit(this, 24, 8); } u8 getSwNo() { return 0xFF; } -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ dCcD_Stts mCcStts; diff --git a/include/d/actor/d_a_obj_glowSphere.h b/include/d/actor/d_a_obj_glowSphere.h index c6c2ee220e..062a9ce7d5 100644 --- a/include/d/actor/d_a_obj_glowSphere.h +++ b/include/d/actor/d_a_obj_glowSphere.h @@ -30,7 +30,6 @@ public: bool isSet() { return mIsSet; } daGlwSph_c* getpSph() { return mpSph; } -private: /* 0x0 */ daGlwSph_c* mpSph; /* 0x4 */ s8 mIsSet; }; diff --git a/include/d/actor/d_a_obj_goGate.h b/include/d/actor/d_a_obj_goGate.h index a0a66c7f32..8ed98a43e6 100644 --- a/include/d/actor/d_a_obj_goGate.h +++ b/include/d/actor/d_a_obj_goGate.h @@ -40,7 +40,6 @@ public: u32 getLR() { return fopAcM_GetParamBit(this, 8, 8); } u32 getSw() { return fopAcM_GetParamBit(this, 0, 8); } -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ u8 mMode; diff --git a/include/d/actor/d_a_obj_gomikabe.h b/include/d/actor/d_a_obj_gomikabe.h index 441fff371f..a0a01c4e20 100644 --- a/include/d/actor/d_a_obj_gomikabe.h +++ b/include/d/actor/d_a_obj_gomikabe.h @@ -41,7 +41,6 @@ public: int Draw(); int Delete(); -private: /* 0x05A0 */ u8 mSwBit; /* 0x05A1 */ u8 mAction; /* 0x05A2 */ u8 field_0x5a2; diff --git a/include/d/actor/d_a_obj_gpTaru.h b/include/d/actor/d_a_obj_gpTaru.h index b3b31a5c9d..1ab93b2586 100644 --- a/include/d/actor/d_a_obj_gpTaru.h +++ b/include/d/actor/d_a_obj_gpTaru.h @@ -46,7 +46,6 @@ public: static DUSK_GAME_DATA const dCcD_SrcGObjInf mCcDObjInfo; static DUSK_GAME_DATA dCcD_SrcCyl mCcDCyl; -private: /* 0x56C */ request_of_phase_process_class mPhase; /* 0x574 */ J3DModel* mpModel; /* 0x578 */ u8 mMode; diff --git a/include/d/actor/d_a_obj_gra2.h b/include/d/actor/d_a_obj_gra2.h index 3cf17e090c..4add220bcd 100644 --- a/include/d/actor/d_a_obj_gra2.h +++ b/include/d/actor/d_a_obj_gra2.h @@ -243,7 +243,6 @@ public: void setDemoMode(s16 mDemoMode) { mDemoCamMode = mDemoMode; } s16 getDemoMode() { return mDemoCamMode; } -private: /* 0x0A48 */ u16 field_0xa48; /* 0x0A4C */ OBJ_GRA_HIO_CLASS* mpHIO; /* 0x0A50 */ Process field_0xa50; diff --git a/include/d/actor/d_a_obj_graWall.h b/include/d/actor/d_a_obj_graWall.h index ebcd1cdb58..037767547a 100644 --- a/include/d/actor/d_a_obj_graWall.h +++ b/include/d/actor/d_a_obj_graWall.h @@ -20,7 +20,6 @@ public: void col_init(); void col_set(); -private: /* 0x568 */ dCcD_Stts mStts; /* 0x5A4 */ dCcD_Cyl mCyl; /* 0x6E0 */ u8 field_0x6e0; diff --git a/include/d/actor/d_a_obj_gra_rock.h b/include/d/actor/d_a_obj_gra_rock.h index 24e816a829..21ec800563 100644 --- a/include/d/actor/d_a_obj_gra_rock.h +++ b/include/d/actor/d_a_obj_gra_rock.h @@ -33,7 +33,6 @@ public: static DUSK_GAME_DATA dCcD_SrcCyl const mCcDCyl; -private: /* 0x5A0 */ request_of_phase_process_class mPhases[5]; /* 0x5C8 */ J3DModel* mModel; /* 0x5CC */ mDoExt_btpAnm mBtp; diff --git a/include/d/actor/d_a_obj_grave_stone.h b/include/d/actor/d_a_obj_grave_stone.h index d41d58348a..9155a2f54c 100644 --- a/include/d/actor/d_a_obj_grave_stone.h +++ b/include/d/actor/d_a_obj_grave_stone.h @@ -36,7 +36,6 @@ public: int Draw(); int Delete(); -private: friend class daNpc_zrZ_c; /* 0x5A0 */ request_of_phase_process_class mPhase; diff --git a/include/d/actor/d_a_obj_groundwater.h b/include/d/actor/d_a_obj_groundwater.h index 5e9061d89c..1fc0f0ef37 100644 --- a/include/d/actor/d_a_obj_groundwater.h +++ b/include/d/actor/d_a_obj_groundwater.h @@ -47,7 +47,6 @@ public: u8 getSw() { return fopAcM_GetParamBit(this, 8, 8); } u8 getSw2() { return fopAcM_GetParamBit(this, 16, 8); } -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mModel1; /* 0x5AC */ J3DModel* mModel2; diff --git a/include/d/actor/d_a_obj_grz_rock.h b/include/d/actor/d_a_obj_grz_rock.h index cd65d2e906..4c8f382071 100644 --- a/include/d/actor/d_a_obj_grz_rock.h +++ b/include/d/actor/d_a_obj_grz_rock.h @@ -28,7 +28,6 @@ public: void setSmashFlag(u8 i_smashFlag) { mSmashFlag = i_smashFlag; } -private: /* 0x568 */ request_of_phase_process_class mPhase[1]; /* 0x5A0 */ J3DModel* mpModel; /* 0x5AC */ dBgS_ObjAcch mBgc; diff --git a/include/d/actor/d_a_obj_hakai_brl.h b/include/d/actor/d_a_obj_hakai_brl.h index dba4b3cd3f..9bd109da7c 100644 --- a/include/d/actor/d_a_obj_hakai_brl.h +++ b/include/d/actor/d_a_obj_hakai_brl.h @@ -34,7 +34,6 @@ public: static DUSK_GAME_DATA dCcD_SrcCyl const s_CcDCyl; -private: /* 0x574 */ J3DModel* mpModel; /* 0x578 */ dCcD_Stts mStts; /* 0x5B4 */ dCcD_Cyl mCyl; diff --git a/include/d/actor/d_a_obj_hakai_ftr.h b/include/d/actor/d_a_obj_hakai_ftr.h index 45c815c5f9..ac7f749860 100644 --- a/include/d/actor/d_a_obj_hakai_ftr.h +++ b/include/d/actor/d_a_obj_hakai_ftr.h @@ -31,7 +31,6 @@ public: static DUSK_GAME_DATA dCcD_SrcCyl const s_CcDCyl; -private: /* 0x574 */ Mtx mMtx; /* 0x5A4 */ dBgW* field_0x5a4; /* 0x5A8 */ J3DModel* mpModel; diff --git a/include/d/actor/d_a_obj_hasu2.h b/include/d/actor/d_a_obj_hasu2.h index 9c36c0d180..203b4ff159 100644 --- a/include/d/actor/d_a_obj_hasu2.h +++ b/include/d/actor/d_a_obj_hasu2.h @@ -29,7 +29,6 @@ public: virtual ~daObjMHasu_c() {}; void setRideFlag(bool i_ride) { mRideFlag = i_ride; } -private: /* 0x5A8 */ Mtx mMtx; /* 0x5D8 */ Mtx mMtx2; /* 0x608 */ J3DModel* mModel; diff --git a/include/d/actor/d_a_obj_hbombkoya.h b/include/d/actor/d_a_obj_hbombkoya.h index 9f9c0a5149..b1d76f819b 100644 --- a/include/d/actor/d_a_obj_hbombkoya.h +++ b/include/d/actor/d_a_obj_hbombkoya.h @@ -39,7 +39,6 @@ public: 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; diff --git a/include/d/actor/d_a_obj_hfuta.h b/include/d/actor/d_a_obj_hfuta.h index 77015715d0..4f4ee44eeb 100644 --- a/include/d/actor/d_a_obj_hfuta.h +++ b/include/d/actor/d_a_obj_hfuta.h @@ -37,7 +37,6 @@ public: void setMode(u8 mode) { mMode = mode; } -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mModel; /* 0x5AC */ cXyz mTransM; diff --git a/include/d/actor/d_a_obj_hsTarget.h b/include/d/actor/d_a_obj_hsTarget.h index 1e0e775e12..50a497eb8e 100644 --- a/include/d/actor/d_a_obj_hsTarget.h +++ b/include/d/actor/d_a_obj_hsTarget.h @@ -23,7 +23,6 @@ public: u8 getModelType() { return fopAcM_GetParamBit(this, 0, 4); } -private: /* 0x5A0 */ request_of_phase_process_class mPhaseReq; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ u8 mIndex; diff --git a/include/d/actor/d_a_obj_iceleaf.h b/include/d/actor/d_a_obj_iceleaf.h index da79be5bc5..42ad6237e7 100644 --- a/include/d/actor/d_a_obj_iceleaf.h +++ b/include/d/actor/d_a_obj_iceleaf.h @@ -61,7 +61,6 @@ public: u8 checkRideStatus() { return fopAcM_GetParamBit(this, 0x10, 8); } u8 getSwbit() { return fopAcM_GetParamBit(this, 8, 8); } -private: /* 0x568 */ request_of_phase_process_class mPhase; /* 0x570 */ J3DModel* mpModel; /* 0x574 */ dBgS_ObjAcch mAcch; diff --git a/include/d/actor/d_a_obj_itamato.h b/include/d/actor/d_a_obj_itamato.h index 10c6459887..b9080f7db7 100644 --- a/include/d/actor/d_a_obj_itamato.h +++ b/include/d/actor/d_a_obj_itamato.h @@ -46,7 +46,7 @@ public: #endif class daObj_ItaMato_c : public fopAc_ac_c { -private: +public: /* 0x568 */ OBJ_ITAMATO_HIO_CLASS* mHIO; /* 0x56C */ request_of_phase_process_class mPhase; /* 0x574 */ J3DModel* mpModels[2]; diff --git a/include/d/actor/d_a_obj_kabuto.h b/include/d/actor/d_a_obj_kabuto.h index 9738147885..2b9d6255ee 100644 --- a/include/d/actor/d_a_obj_kabuto.h +++ b/include/d/actor/d_a_obj_kabuto.h @@ -47,7 +47,6 @@ public: cPhs_Step create(); inline int Draw(); -private: /* 0x590 */ dCcD_Stts mCcStts; /* 0x5CC */ dCcD_Sph mCcSph; /* 0x704 */ daPy_boomerangMove_c mBoomerangMove; diff --git a/include/d/actor/d_a_obj_kag.h b/include/d/actor/d_a_obj_kag.h index 58692d7a8c..09c9a088a0 100644 --- a/include/d/actor/d_a_obj_kag.h +++ b/include/d/actor/d_a_obj_kag.h @@ -39,7 +39,6 @@ public: void kag_setParticle(); inline int CreateHeap(); inline int draw(); -private: /* 0x590 */ request_of_phase_process_class mPhase; /* 0x598 */ Z2Creature mSound; /* 0x628 */ mDoExt_McaMorfSO* mpModelMorf; diff --git a/include/d/actor/d_a_obj_kago.h b/include/d/actor/d_a_obj_kago.h index 265db41c57..4a6ed74730 100644 --- a/include/d/actor/d_a_obj_kago.h +++ b/include/d/actor/d_a_obj_kago.h @@ -125,7 +125,6 @@ public: field_0xb68 = 0.0f; } -private: /* 0x568 */ OBJ_KAGO_HIO_CLASS* mpHIO; /* 0x56C */ request_of_phase_process_class mPhase; /* 0x574 */ J3DModel* field_0x574; diff --git a/include/d/actor/d_a_obj_kaisou.h b/include/d/actor/d_a_obj_kaisou.h index 3398c24884..36d6f568df 100644 --- a/include/d/actor/d_a_obj_kaisou.h +++ b/include/d/actor/d_a_obj_kaisou.h @@ -28,7 +28,6 @@ public: inline int CreateHeap(); inline int Draw(); -private: /* 0x568 */ u8 field_0x568; /* 0x569 */ u8 field_0x569; /* 0x56A */ u8 field_0x56a[0x56e - 0x56a]; diff --git a/include/d/actor/d_a_obj_kamakiri.h b/include/d/actor/d_a_obj_kamakiri.h index 3b2d56e533..52b648ea48 100644 --- a/include/d/actor/d_a_obj_kamakiri.h +++ b/include/d/actor/d_a_obj_kamakiri.h @@ -56,7 +56,6 @@ public: u8 CreateChk(); int create(); -private: /* 0x590 */ dCcD_Stts mStts; /* 0x5CC */ dCcD_Sph mSphere; /* 0x704 */ daPy_boomerangMove_c mBoomerangMove; diff --git a/include/d/actor/d_a_obj_kantera.h b/include/d/actor/d_a_obj_kantera.h index 0228b51fd5..fbe230ed16 100644 --- a/include/d/actor/d_a_obj_kantera.h +++ b/include/d/actor/d_a_obj_kantera.h @@ -33,7 +33,6 @@ public: void setStatus(u8 i_status) { mStatus = i_status; } -private: /* 0x92C */ u32 field_0x92c; /* 0x930 */ s32 field_0x930; /* 0x934 */ u8 mStatus; diff --git a/include/d/actor/d_a_obj_katatsumuri.h b/include/d/actor/d_a_obj_katatsumuri.h index e481d3eb3a..93b9368fb5 100644 --- a/include/d/actor/d_a_obj_katatsumuri.h +++ b/include/d/actor/d_a_obj_katatsumuri.h @@ -55,7 +55,6 @@ public: bool CreateChk(); int create(); -private: /* 0x590 */ dBgS_ObjAcch mAcch; /* 0x768 */ dBgS_GndChk mGndChk; /* 0x7BC */ u8 field_0x7bc[0x7c0 - 0x7bc]; diff --git a/include/d/actor/d_a_obj_kazeneko.h b/include/d/actor/d_a_obj_kazeneko.h index 73147b6fbe..164612ecfc 100644 --- a/include/d/actor/d_a_obj_kazeneko.h +++ b/include/d/actor/d_a_obj_kazeneko.h @@ -46,7 +46,6 @@ public: const KazoNekoAttr& attr() { return M_attr; } static DUSK_GAME_DATA KazoNekoAttr const M_attr; -private: /* 0x568 */ J3DModel* mModel; /* 0x56C */ J3DModel* mArmModels[4]; /* 0x57C */ request_of_phase_process_class mPhase; diff --git a/include/d/actor/d_a_obj_kgate.h b/include/d/actor/d_a_obj_kgate.h index 96798028b2..f7fe72767c 100644 --- a/include/d/actor/d_a_obj_kgate.h +++ b/include/d/actor/d_a_obj_kgate.h @@ -46,7 +46,6 @@ public: 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/d/actor/d_a_obj_kiPot.h b/include/d/actor/d_a_obj_kiPot.h index 01d7cf76c0..248daa2d46 100644 --- a/include/d/actor/d_a_obj_kiPot.h +++ b/include/d/actor/d_a_obj_kiPot.h @@ -23,7 +23,6 @@ public: int Draw(); int Delete(); -private: /* 0x568 */ u8 field_0x568[0x574 - 0x568]; /* 0x574 */ u8 mMode; /* 0x575 */ u8 field_0x575; diff --git a/include/d/actor/d_a_obj_kjgjs.h b/include/d/actor/d_a_obj_kjgjs.h index 495750bd89..189c672c7d 100644 --- a/include/d/actor/d_a_obj_kjgjs.h +++ b/include/d/actor/d_a_obj_kjgjs.h @@ -25,7 +25,6 @@ public: u32 getType() { return fopAcM_GetParamBit(this, 0, 4); } -private: /* 0x5A8 */ Mtx mMtx[2]; /* 0x608 */ J3DModel* mpModel; /* 0x60C */ s32 field_0x60c; diff --git a/include/d/actor/d_a_obj_klift00.h b/include/d/actor/d_a_obj_klift00.h index ab5403d51b..d87c2d4459 100644 --- a/include/d/actor/d_a_obj_klift00.h +++ b/include/d/actor/d_a_obj_klift00.h @@ -33,7 +33,6 @@ public: LOCK_e = (1 << 6), NO_BASE_DISP = (1 << 7) }; -private: struct ChainPos { cXyz mDeltaPosVector; cXyz mCurrentPos; diff --git a/include/d/actor/d_a_obj_knBullet.h b/include/d/actor/d_a_obj_knBullet.h index e8056fbb25..fa2d5397a2 100644 --- a/include/d/actor/d_a_obj_knBullet.h +++ b/include/d/actor/d_a_obj_knBullet.h @@ -26,7 +26,6 @@ public: u8 getActionMode() { return mActionMode; } void setActionMode(u8 i_action) { mActionMode = i_action; } -private: /* 0x568 */ Mtx mMtx; /* 0x598 */ dCcD_Stts mCcStts; /* 0x5D4 */ dCcD_Sph mCcSph; diff --git a/include/d/actor/d_a_obj_kshutter.h b/include/d/actor/d_a_obj_kshutter.h index b217adef2d..a0a2204c0d 100644 --- a/include/d/actor/d_a_obj_kshutter.h +++ b/include/d/actor/d_a_obj_kshutter.h @@ -64,7 +64,6 @@ public: u8 getType() { return fopAcM_GetParamBit(this, 8, 8); } u8 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); } void setAction(u8 action) { mAction = action; } -private: /* 0x5A0 */ request_of_phase_process_class mPhase1; /* 0x5A8 */ request_of_phase_process_class mPhase2; /* 0x5B0 */ J3DModel* mpModel; diff --git a/include/d/actor/d_a_obj_ktOnFire.h b/include/d/actor/d_a_obj_ktOnFire.h index 39875e122e..7d292bf286 100644 --- a/include/d/actor/d_a_obj_ktOnFire.h +++ b/include/d/actor/d_a_obj_ktOnFire.h @@ -26,7 +26,6 @@ public: static DUSK_GAME_DATA const dCcD_SrcGObjInf mCcDObjInfo; static DUSK_GAME_DATA dCcD_SrcCyl mCcDCyl; -private: /* 0x568 */ dCcD_Stts mCcStts; /* 0x5A4 */ dCcD_Cyl mCcCyl; /* 0x6E0 */ u8 mWaitTime; diff --git a/include/d/actor/d_a_obj_kuwagata.h b/include/d/actor/d_a_obj_kuwagata.h index 9df3f0bc35..a14b0544bc 100644 --- a/include/d/actor/d_a_obj_kuwagata.h +++ b/include/d/actor/d_a_obj_kuwagata.h @@ -47,7 +47,6 @@ public: int create(); inline int Draw(); -private: /* 0x590 */ dCcD_Stts mStts; /* 0x5CC */ dCcD_Sph mSph; /* 0x704 */ daPy_boomerangMove_c mBoomerangMove; diff --git a/include/d/actor/d_a_obj_kwheel00.h b/include/d/actor/d_a_obj_kwheel00.h index ceaf132fd6..2d58cb32f1 100644 --- a/include/d/actor/d_a_obj_kwheel00.h +++ b/include/d/actor/d_a_obj_kwheel00.h @@ -41,7 +41,6 @@ public: enum Type_e { TYPE_LARGE_GOLD, TYPE_SMALL_PLATINUM }; -private: enum QuadrantalAngle_e { DEG_INVALID = -1, DEG_0, DEG_90, DEG_180, DEG_270, DEG_MAX}; /* 0x5B8 */ Mtx mNewBgMtx; diff --git a/include/d/actor/d_a_obj_kwheel01.h b/include/d/actor/d_a_obj_kwheel01.h index 40bc025db4..9c6fa31075 100644 --- a/include/d/actor/d_a_obj_kwheel01.h +++ b/include/d/actor/d_a_obj_kwheel01.h @@ -27,7 +27,6 @@ public: int Delete(); bool eventStart(); -private: /* 0x5B8 */ Mtx mNewBgMtx; /* 0x5E8 */ Mtx mTransformMtx; /* 0x618 */ J3DModel* mpModel; diff --git a/include/d/actor/d_a_obj_kznkarm.h b/include/d/actor/d_a_obj_kznkarm.h index c70908fcb8..3838d1f9ff 100644 --- a/include/d/actor/d_a_obj_kznkarm.h +++ b/include/d/actor/d_a_obj_kznkarm.h @@ -63,7 +63,6 @@ public: static DUSK_GAME_DATA daObjKznkarm_Attr_c const M_attr; static DUSK_GAME_DATA actionFunc ActionTable[4][2]; -private: /* 0x568 */ J3DModel* mpModel; /* 0x56C */ request_of_phase_process_class mPhase; /* 0x574 */ dBgS_AcchCir mAcchCir; diff --git a/include/d/actor/d_a_obj_ladder.h b/include/d/actor/d_a_obj_ladder.h index 72f6fce4d2..b46bf99603 100644 --- a/include/d/actor/d_a_obj_ladder.h +++ b/include/d/actor/d_a_obj_ladder.h @@ -76,7 +76,6 @@ namespace daObjLadder { static DUSK_GAME_DATA char const M_arcname[5]; static DUSK_GAME_DATA Mtx M_tmp_mtx; -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mModel; /* 0x5AC */ Type_e mType; diff --git a/include/d/actor/d_a_obj_laundry.h b/include/d/actor/d_a_obj_laundry.h index cc79bc4e05..3dd76c6a39 100644 --- a/include/d/actor/d_a_obj_laundry.h +++ b/include/d/actor/d_a_obj_laundry.h @@ -56,7 +56,6 @@ public: inline int daObjLdy_Draw(); inline int daObjLdy_Execute(); -private: static DUSK_GAME_DATA const daObjLdy_Attr_c mAttr; /* 0x568 */ J3DModel* mpModel; diff --git a/include/d/actor/d_a_obj_laundry_rope.h b/include/d/actor/d_a_obj_laundry_rope.h index 3ecab164b2..85d76cbe8d 100644 --- a/include/d/actor/d_a_obj_laundry_rope.h +++ b/include/d/actor/d_a_obj_laundry_rope.h @@ -58,7 +58,6 @@ public: static DUSK_GAME_DATA const daObjLndRope_Attr_c mAttr; static const daObjLndRope_Hio_c M_Hio; -private: /* 0x0568 */ mDoExt_3DlineMat1_c mRopeMat; /* 0x05a4 */ request_of_phase_process_class mPhase; /* 0x05ac */ Mtx mMtx; diff --git a/include/d/actor/d_a_obj_life_container.h b/include/d/actor/d_a_obj_life_container.h index d4dc5bb334..a7b209cb94 100644 --- a/include/d/actor/d_a_obj_life_container.h +++ b/include/d/actor/d_a_obj_life_container.h @@ -64,7 +64,6 @@ public: current.pos = new_pos; } -// private: /* 0x92C */ fpc_ProcID mItemId; /* 0x930 */ int mCounter; /* 0x934 */ u8 mStatus; diff --git a/include/d/actor/d_a_obj_lv1Candle00.h b/include/d/actor/d_a_obj_lv1Candle00.h index e9e62da388..c70d484930 100644 --- a/include/d/actor/d_a_obj_lv1Candle00.h +++ b/include/d/actor/d_a_obj_lv1Candle00.h @@ -30,7 +30,6 @@ public: int Draw(); int Delete(); -private: /* 0x568 */ request_of_phase_process_class mPhase; /* 0x570 */ J3DModel* mpModel; /* 0x574 */ dCcD_Stts mStts; diff --git a/include/d/actor/d_a_obj_lv1Candle01.h b/include/d/actor/d_a_obj_lv1Candle01.h index 632c117f10..1f1dbe4ee4 100644 --- a/include/d/actor/d_a_obj_lv1Candle01.h +++ b/include/d/actor/d_a_obj_lv1Candle01.h @@ -27,7 +27,6 @@ public: int Draw(); int Delete(); -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ dCcD_Stts mStts; diff --git a/include/d/actor/d_a_obj_lv2Candle.h b/include/d/actor/d_a_obj_lv2Candle.h index 19be29a16e..424dd844fd 100644 --- a/include/d/actor/d_a_obj_lv2Candle.h +++ b/include/d/actor/d_a_obj_lv2Candle.h @@ -37,7 +37,6 @@ public: 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; diff --git a/include/d/actor/d_a_obj_lv3Candle.h b/include/d/actor/d_a_obj_lv3Candle.h index 7b9765136d..76edaaac77 100644 --- a/include/d/actor/d_a_obj_lv3Candle.h +++ b/include/d/actor/d_a_obj_lv3Candle.h @@ -29,7 +29,6 @@ public: int getSwBit() { return fopAcM_GetParamBit(this, 0, 8); } int getType() { return fopAcM_GetParamBit(this, 8, 8); } -private: /* 0x568 */ request_of_phase_process_class mPhaseReq; /* 0x570 */ J3DModel* mpModel; /* 0x574 */ u8 mType; diff --git a/include/d/actor/d_a_obj_lv3Water.h b/include/d/actor/d_a_obj_lv3Water.h index de4ff03356..82f5be1661 100644 --- a/include/d/actor/d_a_obj_lv3Water.h +++ b/include/d/actor/d_a_obj_lv3Water.h @@ -45,7 +45,6 @@ public: int getParamType() { return (shape_angle.x & 0xFF00) >> 8; } u8 getType() { return mType; } -private: /* 0x5B8 */ request_of_phase_process_class mPhase; /* 0x5C0 */ J3DModel* mpModel1; /* 0x5C4 */ J3DModel* mpModel2; diff --git a/include/d/actor/d_a_obj_lv3Water2.h b/include/d/actor/d_a_obj_lv3Water2.h index be13ef4819..4227e8bcb0 100644 --- a/include/d/actor/d_a_obj_lv3Water2.h +++ b/include/d/actor/d_a_obj_lv3Water2.h @@ -29,7 +29,6 @@ public: int Delete(); bool eventStart(); -private: /* 0x5B8 */ request_of_phase_process_class mPhase; /* 0x5C0 */ J3DModel* mpModel; /* 0x5C4 */ mDoExt_btkAnm mRefractionAnm; // Applied to water surface diff --git a/include/d/actor/d_a_obj_lv3saka00.h b/include/d/actor/d_a_obj_lv3saka00.h index f08f4a5d19..5207e74de8 100644 --- a/include/d/actor/d_a_obj_lv3saka00.h +++ b/include/d/actor/d_a_obj_lv3saka00.h @@ -28,7 +28,6 @@ public: 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/d/actor/d_a_obj_lv3waterEff.h b/include/d/actor/d_a_obj_lv3waterEff.h index fdf7b204dc..a612168fac 100644 --- a/include/d/actor/d_a_obj_lv3waterEff.h +++ b/include/d/actor/d_a_obj_lv3waterEff.h @@ -18,7 +18,6 @@ public: int execute(); int _delete(); -private: /* 0x568 */ cXyz mSePositions[2]; /* 0x580 */ JPABaseEmitter* mParticles[4]; /* 0x590 */ u8 unused_0x590[0x594 - 0x590]; diff --git a/include/d/actor/d_a_obj_lv4CandleDemoTag.h b/include/d/actor/d_a_obj_lv4CandleDemoTag.h index 58378ecd4e..4ac8618776 100644 --- a/include/d/actor/d_a_obj_lv4CandleDemoTag.h +++ b/include/d/actor/d_a_obj_lv4CandleDemoTag.h @@ -43,7 +43,6 @@ public: virtual ~dalv4CandleDemoTag_c() {} virtual bool eventStart(); -private: /* 0x584 */ u8 mMode; /* 0x585 */ u8 mPathID; /* 0x586 */ u8 mSwNG; diff --git a/include/d/actor/d_a_obj_lv4EdShutter.h b/include/d/actor/d_a_obj_lv4EdShutter.h index a19de47873..992431c64d 100644 --- a/include/d/actor/d_a_obj_lv4EdShutter.h +++ b/include/d/actor/d_a_obj_lv4EdShutter.h @@ -45,7 +45,6 @@ public: u8 getZenmetuSw() { return shape_angle.z & 0xFF; } u8 getStatus() { return mStatus; } -private: /* 0x5B8 */ request_of_phase_process_class mPhase; /* 0x5C0 */ J3DModel* mpModel; /* 0x5C4 */ u8 mMode; diff --git a/include/d/actor/d_a_obj_lv4HsTarget.h b/include/d/actor/d_a_obj_lv4HsTarget.h index fbb1c8862a..c618aec40e 100644 --- a/include/d/actor/d_a_obj_lv4HsTarget.h +++ b/include/d/actor/d_a_obj_lv4HsTarget.h @@ -23,7 +23,6 @@ public: virtual int Draw(); virtual int Delete(); -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mpModel; }; diff --git a/include/d/actor/d_a_obj_lv4PoGate.h b/include/d/actor/d_a_obj_lv4PoGate.h index 480885fa0a..bd46dd30c4 100644 --- a/include/d/actor/d_a_obj_lv4PoGate.h +++ b/include/d/actor/d_a_obj_lv4PoGate.h @@ -52,7 +52,6 @@ public: int getSw() { return fopAcM_GetParamBit(this, 0, 8); } -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ u8 mMode; diff --git a/include/d/actor/d_a_obj_lv4RailWall.h b/include/d/actor/d_a_obj_lv4RailWall.h index 7cffceedc0..39858be708 100644 --- a/include/d/actor/d_a_obj_lv4RailWall.h +++ b/include/d/actor/d_a_obj_lv4RailWall.h @@ -50,7 +50,6 @@ public: u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); } -private: /* 0x5B0 */ request_of_phase_process_class mPhase; /* 0x5B8 */ J3DModel* mpModel; /* 0x5BC */ dBgS_ObjAcch field_0x5bc; diff --git a/include/d/actor/d_a_obj_lv4SlideWall.h b/include/d/actor/d_a_obj_lv4SlideWall.h index fcafa19dfc..1e08e68206 100644 --- a/include/d/actor/d_a_obj_lv4SlideWall.h +++ b/include/d/actor/d_a_obj_lv4SlideWall.h @@ -32,7 +32,6 @@ public: int getSw() { return fopAcM_GetParamBit(this, 0, 8); } -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ u8 mMode; diff --git a/include/d/actor/d_a_obj_lv4chandelier.h b/include/d/actor/d_a_obj_lv4chandelier.h index d0e7c53515..2b965d5831 100644 --- a/include/d/actor/d_a_obj_lv4chandelier.h +++ b/include/d/actor/d_a_obj_lv4chandelier.h @@ -43,7 +43,6 @@ public: int getAddChain2() { return fopAcM_GetParamBit(this, 12, 4); } int getSw() { return fopAcM_GetParamBit(this, 16, 8); } -private: /* 0x05A8 */ Mtx field_0x5a8; /* 0x05D8 */ Mtx field_0x5d8; /* 0x0608 */ J3DModel* mModel; diff --git a/include/d/actor/d_a_obj_lv4floor.h b/include/d/actor/d_a_obj_lv4floor.h index 7b6681419d..704ccece93 100644 --- a/include/d/actor/d_a_obj_lv4floor.h +++ b/include/d/actor/d_a_obj_lv4floor.h @@ -38,7 +38,6 @@ public: u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8) & 0xFF; } -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ f32 mMoveYPos; diff --git a/include/d/actor/d_a_obj_lv4gear.h b/include/d/actor/d_a_obj_lv4gear.h index 5e649c0722..9c3d4920c1 100644 --- a/include/d/actor/d_a_obj_lv4gear.h +++ b/include/d/actor/d_a_obj_lv4gear.h @@ -31,7 +31,6 @@ public: 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/d/actor/d_a_obj_lv4prelvtr.h b/include/d/actor/d_a_obj_lv4prelvtr.h index 2fd50068ac..9e4846671c 100644 --- a/include/d/actor/d_a_obj_lv4prelvtr.h +++ b/include/d/actor/d_a_obj_lv4prelvtr.h @@ -26,7 +26,6 @@ public: int getSwNo() { return fopAcM_GetParamBit(this, 0, 8); } -private: /* 0x5A8 */ Mtx mMtx1; /* 0x5D8 */ Mtx mMtx2; /* 0x608 */ J3DModel* mpModel; diff --git a/include/d/actor/d_a_obj_lv4sand.h b/include/d/actor/d_a_obj_lv4sand.h index 0ff6420e27..1b6272440b 100644 --- a/include/d/actor/d_a_obj_lv4sand.h +++ b/include/d/actor/d_a_obj_lv4sand.h @@ -46,7 +46,6 @@ public: u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); } -private: /* 0x5B0 */ request_of_phase_process_class mPhase; /* 0x5B8 */ J3DModel* mpModel; /* 0x5BC */ mDoExt_btkAnm* mpBtk; diff --git a/include/d/actor/d_a_obj_lv5FloorBoard.h b/include/d/actor/d_a_obj_lv5FloorBoard.h index 1dcba0ade2..e8ae0d18b2 100644 --- a/include/d/actor/d_a_obj_lv5FloorBoard.h +++ b/include/d/actor/d_a_obj_lv5FloorBoard.h @@ -38,7 +38,6 @@ public: static DUSK_GAME_DATA const dCcD_SrcGObjInf mCcDObjInfo; static DUSK_GAME_DATA dCcD_SrcCyl mCcDCyl; -private: /* 0x5A0 */ dCcD_Stts mCcStts; /* 0x5DC */ dCcD_Cyl mCcCyl; /* 0x718 */ request_of_phase_process_class mPhase; diff --git a/include/d/actor/d_a_obj_lv5IceWall.h b/include/d/actor/d_a_obj_lv5IceWall.h index c9f459e75d..e04d413249 100644 --- a/include/d/actor/d_a_obj_lv5IceWall.h +++ b/include/d/actor/d_a_obj_lv5IceWall.h @@ -42,7 +42,6 @@ public: static DUSK_GAME_DATA const dCcD_SrcGObjInf mCcDObjInfo; static DUSK_GAME_DATA dCcD_SrcCyl mCcDCyl; -private: /* 0x5A0 */ dCcD_Stts mCcStts; /* 0x5DC */ dCcD_Cyl mCcCyl[2]; /* 0x854 */ request_of_phase_process_class mPhase; diff --git a/include/d/actor/d_a_obj_lv5SwIce.h b/include/d/actor/d_a_obj_lv5SwIce.h index 8adc14f2af..9e990e3da7 100644 --- a/include/d/actor/d_a_obj_lv5SwIce.h +++ b/include/d/actor/d_a_obj_lv5SwIce.h @@ -38,7 +38,6 @@ public: static DUSK_GAME_DATA const dCcD_SrcGObjInf mCcDObjInfo; static DUSK_GAME_DATA dCcD_SrcCyl mCcDCyl; -private: /* 0x5A0 */ dCcD_Stts mCcStts; /* 0x5DC */ dCcD_Cyl mCcCyl; /* 0x718 */ request_of_phase_process_class mPhase; diff --git a/include/d/actor/d_a_obj_lv5ychndlr.h b/include/d/actor/d_a_obj_lv5ychndlr.h index 8db78c0afa..dc3a8f1ce2 100644 --- a/include/d/actor/d_a_obj_lv5ychndlr.h +++ b/include/d/actor/d_a_obj_lv5ychndlr.h @@ -26,7 +26,6 @@ public: virtual int Delete(); virtual ~daObjYchndlr_c() {} -private: /* 0x5A8 */ Mtx field_0x5a8; /* 0x5D8 */ Mtx field_0x5d8; /* 0x608 */ J3DModel* mpChandlierModel; diff --git a/include/d/actor/d_a_obj_lv6FurikoTrap.h b/include/d/actor/d_a_obj_lv6FurikoTrap.h index 8a5f17336d..5257bc540a 100644 --- a/include/d/actor/d_a_obj_lv6FurikoTrap.h +++ b/include/d/actor/d_a_obj_lv6FurikoTrap.h @@ -28,7 +28,6 @@ public: static DUSK_GAME_DATA const dCcD_SrcGObjInf mCcDObjInfo; static DUSK_GAME_DATA dCcD_SrcSph mCcDSph; -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mModel; /* 0x5AC */ u8 mMode; diff --git a/include/d/actor/d_a_obj_lv6Lblock.h b/include/d/actor/d_a_obj_lv6Lblock.h index 0dbe6a330a..80080c702b 100644 --- a/include/d/actor/d_a_obj_lv6Lblock.h +++ b/include/d/actor/d_a_obj_lv6Lblock.h @@ -34,7 +34,6 @@ public: int getUpMax() { return fopAcM_GetParamBit(this, 8, 4); } int getSw() { return fopAcM_GetParamBit(this, 0, 8); } -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ u8 mMode; diff --git a/include/d/actor/d_a_obj_lv6SwGate.h b/include/d/actor/d_a_obj_lv6SwGate.h index 331e7ae07d..e2844e06ee 100644 --- a/include/d/actor/d_a_obj_lv6SwGate.h +++ b/include/d/actor/d_a_obj_lv6SwGate.h @@ -38,7 +38,6 @@ public: static DUSK_GAME_DATA const dCcD_SrcGObjInf mCcDObjInfo; static DUSK_GAME_DATA dCcD_SrcCyl mCcDCyl; -private: /* 0x5A0 */ dCcD_Stts mCcStts; /* 0x5DC */ dCcD_Cyl mCcDCyls[12]; /* 0x14AC */ request_of_phase_process_class mPhase; diff --git a/include/d/actor/d_a_obj_lv6SzGate.h b/include/d/actor/d_a_obj_lv6SzGate.h index 80601341ec..db3ec0ccce 100644 --- a/include/d/actor/d_a_obj_lv6SzGate.h +++ b/include/d/actor/d_a_obj_lv6SzGate.h @@ -45,7 +45,6 @@ public: u32 getWaitTime() { return fopAcM_GetParamBit(this, 8, 8); } u32 getSw() { return fopAcM_GetParamBit(this, 0, 8); } -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* field_0x5a8; /* 0x5AC */ J3DModel* field_0x5ac; diff --git a/include/d/actor/d_a_obj_lv6Tenbin.h b/include/d/actor/d_a_obj_lv6Tenbin.h index 6cdd8e3538..429ecb58be 100644 --- a/include/d/actor/d_a_obj_lv6Tenbin.h +++ b/include/d/actor/d_a_obj_lv6Tenbin.h @@ -27,7 +27,6 @@ public: int Draw(); int Delete(); -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mModel1; /* 0x5AC */ J3DModel* mModel2; diff --git a/include/d/actor/d_a_obj_lv6TogeRoll.h b/include/d/actor/d_a_obj_lv6TogeRoll.h index 9fedcd5932..4fc557b8b4 100644 --- a/include/d/actor/d_a_obj_lv6TogeRoll.h +++ b/include/d/actor/d_a_obj_lv6TogeRoll.h @@ -66,7 +66,6 @@ public: static DUSK_GAME_DATA dCcD_SrcSph mCcDSph; static DUSK_GAME_DATA dCcD_SrcCps mCcDCps; -private: /* 0x05A0 */ request_of_phase_process_class mPhase; /* 0x05A8 */ J3DModel* mpModel; /* 0x05AC */ u8 mPathID; diff --git a/include/d/actor/d_a_obj_lv6elevta.h b/include/d/actor/d_a_obj_lv6elevta.h index b98ff06f58..192c568552 100644 --- a/include/d/actor/d_a_obj_lv6elevta.h +++ b/include/d/actor/d_a_obj_lv6elevta.h @@ -33,7 +33,6 @@ public: int getSw2No() { return fopAcM_GetParamBit(this, 8, 8); }; int getEvent() { return fopAcM_GetParamBit(this, 0x10, 8); }; -private: /* 0x5B8 */ Mtx mMtx1; /* 0x5E8 */ Mtx mMtx2; /* 0x618 */ J3DModel* mModel; diff --git a/include/d/actor/d_a_obj_lv7bridge.h b/include/d/actor/d_a_obj_lv7bridge.h index 938b87e08f..f53b24e708 100644 --- a/include/d/actor/d_a_obj_lv7bridge.h +++ b/include/d/actor/d_a_obj_lv7bridge.h @@ -45,7 +45,6 @@ public: void setDestroyAnmA() { field_0xa94 = 0; } void setDestroyAnmB() { field_0xa94 = 1; } -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ dBgS_ObjAcch mAcch; diff --git a/include/d/actor/d_a_obj_lv8KekkaiTrap.h b/include/d/actor/d_a_obj_lv8KekkaiTrap.h index aa68df0114..423e59a500 100644 --- a/include/d/actor/d_a_obj_lv8KekkaiTrap.h +++ b/include/d/actor/d_a_obj_lv8KekkaiTrap.h @@ -32,7 +32,6 @@ public: int getType() { return fopAcM_GetParamBit(this, 0, 4); } int getSwBit() { return fopAcM_GetParamBit(this, 4, 8); } -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ u8 mIsSwitch; diff --git a/include/d/actor/d_a_obj_lv8Lift.h b/include/d/actor/d_a_obj_lv8Lift.h index 0b39e25e89..5c2ab58219 100644 --- a/include/d/actor/d_a_obj_lv8Lift.h +++ b/include/d/actor/d_a_obj_lv8Lift.h @@ -68,7 +68,6 @@ public: static DUSK_GAME_DATA f32 const mSpeed[16]; -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ mDoExt_btkAnm mBtk; diff --git a/include/d/actor/d_a_obj_lv9SwShutter.h b/include/d/actor/d_a_obj_lv9SwShutter.h index 06607f5c1c..44e0eef556 100644 --- a/include/d/actor/d_a_obj_lv9SwShutter.h +++ b/include/d/actor/d_a_obj_lv9SwShutter.h @@ -31,7 +31,6 @@ public: int getSw() { return fopAcM_GetParamBit(this, 0, 8); } -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ u8 mMode; diff --git a/include/d/actor/d_a_obj_magLift.h b/include/d/actor/d_a_obj_magLift.h index a8f597bfef..7c15edb05e 100644 --- a/include/d/actor/d_a_obj_magLift.h +++ b/include/d/actor/d_a_obj_magLift.h @@ -49,7 +49,6 @@ public: static DUSK_GAME_DATA f32 const mSpeed[16]; -private: /* 0x5a0 */ request_of_phase_process_class mPhaseReq; /* 0x5a8 */ J3DModel* mpModel; /* 0x5ac */ u8 field_0x5ac [0x5ae - 0x5ac]; diff --git a/include/d/actor/d_a_obj_magLiftRot.h b/include/d/actor/d_a_obj_magLiftRot.h index 647fcee80a..04621f7ddc 100644 --- a/include/d/actor/d_a_obj_magLiftRot.h +++ b/include/d/actor/d_a_obj_magLiftRot.h @@ -29,7 +29,6 @@ public: virtual int Draw(); virtual int Delete(); -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ mDoExt_btkAnm mBtk; diff --git a/include/d/actor/d_a_obj_master_sword.h b/include/d/actor/d_a_obj_master_sword.h index fd41a8d079..e462e61481 100644 --- a/include/d/actor/d_a_obj_master_sword.h +++ b/include/d/actor/d_a_obj_master_sword.h @@ -51,7 +51,6 @@ public: static DUSK_GAME_DATA daObjMasterSword_Attr_c const mAttr; static DUSK_GAME_DATA actionFunc ActionTable[]; -// private: /* 0x568 */ J3DModel* mpModel; /* 0x56C */ request_of_phase_process_class mPhase; /* 0x574 */ mDoExt_btkAnm mBtk; diff --git a/include/d/actor/d_a_obj_metalbox.h b/include/d/actor/d_a_obj_metalbox.h index b7f2fb10cd..10c6462547 100644 --- a/include/d/actor/d_a_obj_metalbox.h +++ b/include/d/actor/d_a_obj_metalbox.h @@ -15,7 +15,7 @@ * */ class daObjMBox_c : public dBgS_MoveBgActor { -private: +public: /* 0x5a0 */ request_of_phase_process_class mPhase; /* 0x5a8 */ J3DModel* mpModel; /* 0x5ac */ dBgS_ObjAcch mAcch; diff --git a/include/d/actor/d_a_obj_mgate.h b/include/d/actor/d_a_obj_mgate.h index 5b86c8aa17..9dc0d63114 100644 --- a/include/d/actor/d_a_obj_mgate.h +++ b/include/d/actor/d_a_obj_mgate.h @@ -39,7 +39,6 @@ public: bool checkLock() { return fopAcM_GetParamBit(this, 5, 1); } u8 checkOpen() { return fopAcM_GetParamBit(this, 8, 4); } -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ request_of_phase_process_class mKeyPhase; /* 0x5B0 */ J3DModel* mpModel; diff --git a/include/d/actor/d_a_obj_mhole.h b/include/d/actor/d_a_obj_mhole.h index aa692338d2..c9818708fd 100644 --- a/include/d/actor/d_a_obj_mhole.h +++ b/include/d/actor/d_a_obj_mhole.h @@ -36,7 +36,6 @@ public: u8 getKind() { return fopAcM_GetParamBit(this, 12, 4); } u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); } -private: /* 0x568 */ request_of_phase_process_class mPhase; /* 0x570 */ J3DModel* mpModel; /* 0x574 */ mDoExt_brkAnm* mpBrkAnm; diff --git a/include/d/actor/d_a_obj_mie.h b/include/d/actor/d_a_obj_mie.h index 6c95ed7f84..faa413e204 100644 --- a/include/d/actor/d_a_obj_mie.h +++ b/include/d/actor/d_a_obj_mie.h @@ -54,7 +54,7 @@ public: * */ class daObj_Mie_c : public fopAc_ac_c { -private: +public: /* 0x568 */ OBJ_MIE_HIO_CLASS* mpHIO; /* 0x56C */ request_of_phase_process_class mPhase; /* 0x574 */ J3DModel* mModel; diff --git a/include/d/actor/d_a_obj_mirror_6pole.h b/include/d/actor/d_a_obj_mirror_6pole.h index 17cf211be3..1a53d23399 100644 --- a/include/d/actor/d_a_obj_mirror_6pole.h +++ b/include/d/actor/d_a_obj_mirror_6pole.h @@ -56,7 +56,6 @@ public: static DUSK_GAME_DATA const actionFunc ActionTable[][2]; -private: /* 0x568 */ J3DModel* mpModel; /* 0x56C */ mDoExt_bckAnm* mpBck; /* 0x570 */ request_of_phase_process_class mPhase; diff --git a/include/d/actor/d_a_obj_mirror_chain.h b/include/d/actor/d_a_obj_mirror_chain.h index 106272f116..e04ab228d5 100644 --- a/include/d/actor/d_a_obj_mirror_chain.h +++ b/include/d/actor/d_a_obj_mirror_chain.h @@ -47,7 +47,6 @@ public: 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/d/actor/d_a_obj_mirror_sand.h b/include/d/actor/d_a_obj_mirror_sand.h index db27ccfaeb..ea7a8a6f30 100644 --- a/include/d/actor/d_a_obj_mirror_sand.h +++ b/include/d/actor/d_a_obj_mirror_sand.h @@ -37,7 +37,6 @@ public: dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354]); } -private: /* 0x568 */ J3DModel* mpModel; /* 0x56C */ mDoExt_bckAnm* mpBck; /* 0x570 */ request_of_phase_process_class mPhase; diff --git a/include/d/actor/d_a_obj_mirror_screw.h b/include/d/actor/d_a_obj_mirror_screw.h index 482506ffc0..7cdf294f9b 100644 --- a/include/d/actor/d_a_obj_mirror_screw.h +++ b/include/d/actor/d_a_obj_mirror_screw.h @@ -65,7 +65,6 @@ public: (this->*mpActionFunc[1])(); } -private: /* 0x5A0 */ J3DModel* mpModel; /* 0x5A4 */ request_of_phase_process_class mPhaseReq; /* 0x5AC */ daObjMirrorScrew_actionFunc* mpActionFunc; diff --git a/include/d/actor/d_a_obj_nameplate.h b/include/d/actor/d_a_obj_nameplate.h index d6aa6356bb..7d5140838a 100644 --- a/include/d/actor/d_a_obj_nameplate.h +++ b/include/d/actor/d_a_obj_nameplate.h @@ -51,7 +51,6 @@ public: inline int draw(); inline int createHeap(); -private: /* 0x568 */ J3DModel* model; /* 0x56C */ request_of_phase_process_class mPhase; /* 0x574 */ Mtx mMtx; diff --git a/include/d/actor/d_a_obj_nan.h b/include/d/actor/d_a_obj_nan.h index 708d75199e..f1c9881764 100644 --- a/include/d/actor/d_a_obj_nan.h +++ b/include/d/actor/d_a_obj_nan.h @@ -42,7 +42,6 @@ public: inline int CreateHeap(); inline int draw(); -private: /* 0x590 */ request_of_phase_process_class mPhase; /* 0x598 */ Z2Creature mCreatureSound; /* 0x628 */ mDoExt_McaMorfSO* mMorf; diff --git a/include/d/actor/d_a_obj_octhashi.h b/include/d/actor/d_a_obj_octhashi.h index 4b5ef5459a..9bb21ce9a4 100644 --- a/include/d/actor/d_a_obj_octhashi.h +++ b/include/d/actor/d_a_obj_octhashi.h @@ -33,7 +33,6 @@ public: int Draw(); int Delete(); -private: /* 0x5a0 */ cXyz field_0x5a0[8]; /* 0x600 */ cXyz field_0x600[8]; /* 0x660 */ csXyz field_0x660[8]; @@ -53,7 +52,6 @@ private: public: /* 0x6e8 */ s16 field_0x6e8; /* 0x6ec */ Z2Creature mSound; -private: /* 0x077c */ u8 field_0x77c[4]; /* 0x0780 */ J3DModel* mpModel[8]; /* 0x07a0 */ u8 field_0x7a0[0x7a4 - 0x7a0]; diff --git a/include/d/actor/d_a_obj_oiltubo.h b/include/d/actor/d_a_obj_oiltubo.h index b4ee8612bc..58aeba161d 100644 --- a/include/d/actor/d_a_obj_oiltubo.h +++ b/include/d/actor/d_a_obj_oiltubo.h @@ -36,7 +36,6 @@ public: static DUSK_GAME_DATA const dCcD_SrcGObjInf mCcDObjInfo; static DUSK_GAME_DATA dCcD_SrcCyl DUSK_CONST mCcDCyl; -private: /* 0x568 */ request_of_phase_process_class mPhase; /* 0x570 */ J3DModel* mpModel; /* 0x574 */ J3DModel* mpBModel; diff --git a/include/d/actor/d_a_obj_onsen.h b/include/d/actor/d_a_obj_onsen.h index 64af56f1d5..43ba02bc25 100644 --- a/include/d/actor/d_a_obj_onsen.h +++ b/include/d/actor/d_a_obj_onsen.h @@ -25,7 +25,6 @@ public: u32 getType() { return fopAcM_GetParamBit(this, 0, 8); } -private: /* 0x5A0 */ request_of_phase_process_class mPhaseReq; /* 0x5A8 */ J3DModel* mpModel[2]; /* 0x5B0 */ mDoExt_btkAnm* mpBtk; diff --git a/include/d/actor/d_a_obj_pdtile.h b/include/d/actor/d_a_obj_pdtile.h index 1dcb327acc..05e04063aa 100644 --- a/include/d/actor/d_a_obj_pdtile.h +++ b/include/d/actor/d_a_obj_pdtile.h @@ -35,7 +35,6 @@ public: u8 getType() { return fopAcM_GetParamBit(this, 0, 4); } -private: /* 0x5A8 */ Mtx mBgMtx; /* 0x5D8 */ Mtx field_0x5d8; /* 0x608 */ J3DModel* mModel; diff --git a/include/d/actor/d_a_obj_pdwall.h b/include/d/actor/d_a_obj_pdwall.h index 45e8213f39..698ac6a6bb 100644 --- a/include/d/actor/d_a_obj_pdwall.h +++ b/include/d/actor/d_a_obj_pdwall.h @@ -26,7 +26,6 @@ public: int getSwNo() { return fopAcM_GetParamBit(this, 0, 8); } -private: /* 0x5A8 */ Mtx field_0x5a8; /* 0x5D8 */ J3DModel* mpModels[10]; /* 0x600 */ Mtx field_0x600[10]; diff --git a/include/d/actor/d_a_obj_picture.h b/include/d/actor/d_a_obj_picture.h index 50d44d808b..af175f93e9 100644 --- a/include/d/actor/d_a_obj_picture.h +++ b/include/d/actor/d_a_obj_picture.h @@ -45,7 +45,6 @@ public: #endif static DUSK_GAME_DATA dCcD_SrcCyl s_CcDCyl_pic_at; -private: /* 0x574 */ dCcD_Stts field_0x574; /* 0x5B0 */ dCcD_Stts field_0x5b0; /* 0x5EC */ dCcD_Stts field_0x5ec; diff --git a/include/d/actor/d_a_obj_pleaf.h b/include/d/actor/d_a_obj_pleaf.h index 5e7a5cde1c..12f14a2bad 100644 --- a/include/d/actor/d_a_obj_pleaf.h +++ b/include/d/actor/d_a_obj_pleaf.h @@ -44,7 +44,7 @@ public: * */ class daObj_Pleaf_c : public fopAc_ac_c { -private: +public: /* 0x568 */ OBJ_PLEAF_HIO_CLASS* mpHIO; /* 0x56C */ request_of_phase_process_class mPhaseReq; /* 0x574 */ J3DModel* mpModel; diff --git a/include/d/actor/d_a_obj_poCandle.h b/include/d/actor/d_a_obj_poCandle.h index defcdb7858..c76356d2df 100644 --- a/include/d/actor/d_a_obj_poCandle.h +++ b/include/d/actor/d_a_obj_poCandle.h @@ -48,7 +48,6 @@ public: u8 getIDNum() { return mIDNum; } void setFireFlag(u8 flag) { mFireFlag = flag; } -private: /* 0x5B8 */ request_of_phase_process_class mPhase; /* 0x5C0 */ J3DModel* mpModel; /* 0x5C4 */ cXyz mFirePos; diff --git a/include/d/actor/d_a_obj_poFire.h b/include/d/actor/d_a_obj_poFire.h index b8c9198b7c..10a91cbf34 100644 --- a/include/d/actor/d_a_obj_poFire.h +++ b/include/d/actor/d_a_obj_poFire.h @@ -68,7 +68,6 @@ public: u8 getMoveEnd() { return mMoveEnd; } u32 getID() { return fopAcM_GetParamBit(this, 0, 8); } -private: /* 0x584 */ request_of_phase_process_class mPhase; /* 0x58C */ int mStaffID; /* 0x590 */ s16 unk590; diff --git a/include/d/actor/d_a_obj_poTbox.h b/include/d/actor/d_a_obj_poTbox.h index 714f7338d3..44b18117e6 100644 --- a/include/d/actor/d_a_obj_poTbox.h +++ b/include/d/actor/d_a_obj_poTbox.h @@ -33,7 +33,6 @@ public: int getSw() { return fopAcM_GetParamBit(this, 0, 8); } int getStat() { return fopAcM_GetParamBit(this, 8, 4); } -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mpBoxModel; /* 0x5AC */ J3DModel* mpAnimModel; diff --git a/include/d/actor/d_a_obj_prop.h b/include/d/actor/d_a_obj_prop.h index d61025630b..157f8dde6b 100644 --- a/include/d/actor/d_a_obj_prop.h +++ b/include/d/actor/d_a_obj_prop.h @@ -26,7 +26,6 @@ public: 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; }; diff --git a/include/d/actor/d_a_obj_pumpkin.h b/include/d/actor/d_a_obj_pumpkin.h index 9dd015c00e..74ba8f3026 100644 --- a/include/d/actor/d_a_obj_pumpkin.h +++ b/include/d/actor/d_a_obj_pumpkin.h @@ -56,7 +56,7 @@ public: * */ class daObj_Pumpkin_c : public fopAc_ac_c { -private: +public: /* 0x568 */ OBJ_PUMPKIN_HIO_CLASS* mpHIO; /* 0x56C */ request_of_phase_process_class mPhaseReq; /* 0x574 */ J3DModel* mpModel; diff --git a/include/d/actor/d_a_obj_rcircle.h b/include/d/actor/d_a_obj_rcircle.h index 43811a0702..5ef1324f2c 100644 --- a/include/d/actor/d_a_obj_rcircle.h +++ b/include/d/actor/d_a_obj_rcircle.h @@ -25,7 +25,6 @@ public: int getSwBit() { return fopAcM_GetParamBit(this, 0, 8) & 0xFF; } -private: /* 0x574 */ mDoExt_brkAnm mBrk; /* 0x58C */ mDoExt_btkAnm mBtk; /* 0x5A4 */ J3DModel* mpModel; diff --git a/include/d/actor/d_a_obj_rfHole.h b/include/d/actor/d_a_obj_rfHole.h index d053d6800c..00a873229c 100644 --- a/include/d/actor/d_a_obj_rfHole.h +++ b/include/d/actor/d_a_obj_rfHole.h @@ -42,7 +42,6 @@ public: int Draw(); int Delete(); -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mModel; /* 0x5AC */ u8 mMode; diff --git a/include/d/actor/d_a_obj_rope_bridge.h b/include/d/actor/d_a_obj_rope_bridge.h index 90532c9ba7..8eababd778 100644 --- a/include/d/actor/d_a_obj_rope_bridge.h +++ b/include/d/actor/d_a_obj_rope_bridge.h @@ -44,7 +44,6 @@ public: u8 getSwbit2() { return fopAcM_GetParamBit(this, 24, 8); } u8 getType() { return fopAcM_GetParamBit(this, 16, 2); } -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ request_of_phase_process_class mRopePhase; /* 0x5B0 */ J3DModel* mpBrgModel; diff --git a/include/d/actor/d_a_obj_rotTrap.h b/include/d/actor/d_a_obj_rotTrap.h index 9534358f4a..069bfe285c 100644 --- a/include/d/actor/d_a_obj_rotTrap.h +++ b/include/d/actor/d_a_obj_rotTrap.h @@ -37,7 +37,6 @@ public: static DUSK_GAME_DATA const dCcD_SrcGObjInf mCcDObjInfo; static DUSK_GAME_DATA dCcD_SrcCyl mCcDCyl; -private: /* 0x05A0 */ request_of_phase_process_class mPhase; /* 0x05A8 */ J3DModel* mpModel; /* 0x05AC */ u8 mMode; diff --git a/include/d/actor/d_a_obj_roten.h b/include/d/actor/d_a_obj_roten.h index 9b4b17a19d..ea78731b77 100644 --- a/include/d/actor/d_a_obj_roten.h +++ b/include/d/actor/d_a_obj_roten.h @@ -25,7 +25,6 @@ public: char DUSK_CONST* getResName(); virtual ~daObj_Roten_c(); -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mModel; /* 0x5AC */ JPABaseEmitter* mEmitters[2]; diff --git a/include/d/actor/d_a_obj_rstair.h b/include/d/actor/d_a_obj_rstair.h index 053692ba9e..6c31ff4648 100644 --- a/include/d/actor/d_a_obj_rstair.h +++ b/include/d/actor/d_a_obj_rstair.h @@ -58,7 +58,6 @@ public: u8 getEventID() { return fopAcM_GetParamBit(this, 0, 8); } void setAction(u8 action) { mAction = action; } -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mModel; /* 0x5AC */ J3DModel* mWaterModels[2]; diff --git a/include/d/actor/d_a_obj_saidan.h b/include/d/actor/d_a_obj_saidan.h index ef38588f00..f421cf55ad 100644 --- a/include/d/actor/d_a_obj_saidan.h +++ b/include/d/actor/d_a_obj_saidan.h @@ -35,7 +35,6 @@ public: virtual int Draw(); virtual int Delete(); -private: /* 0x5A0 */ request_of_phase_process_class mPhaseReq; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ u8 mMode; diff --git a/include/d/actor/d_a_obj_sakuita.h b/include/d/actor/d_a_obj_sakuita.h index e9e4e82120..621084a592 100644 --- a/include/d/actor/d_a_obj_sakuita.h +++ b/include/d/actor/d_a_obj_sakuita.h @@ -45,7 +45,6 @@ public: static DUSK_GAME_DATA daObjSakuita_Attr_c const M_attr; -private: /* 0x568 */ J3DModel* mModel; /* 0x56C */ request_of_phase_process_class mPhase; /* 0x574 */ Mtx mMtx; diff --git a/include/d/actor/d_a_obj_sakuita_rope.h b/include/d/actor/d_a_obj_sakuita_rope.h index dfbed5af0e..37df115ea9 100644 --- a/include/d/actor/d_a_obj_sakuita_rope.h +++ b/include/d/actor/d_a_obj_sakuita_rope.h @@ -82,7 +82,6 @@ public: static DUSK_GAME_DATA daObjItaRope_Attr_c const M_attr; -private: /* 0x570 */ mDoExt_3DlineMat1_c mLineMat; /* 0x5A4 */ request_of_phase_process_class mPhase; /* 0x5AC */ Mtx mMtx; diff --git a/include/d/actor/d_a_obj_scannon.h b/include/d/actor/d_a_obj_scannon.h index 0b1a79e18f..e376f55d40 100644 --- a/include/d/actor/d_a_obj_scannon.h +++ b/include/d/actor/d_a_obj_scannon.h @@ -83,7 +83,6 @@ public: static DUSK_GAME_DATA void (daSCannon_c::*DUSK_CONST s_demoExeProc_FireFirst[][2])(); static DUSK_GAME_DATA void (daSCannon_c::*DUSK_CONST s_demoExeProc_FireSecond[][2])(); -private: /* 0x574 */ request_of_phase_process_class mZevPhase; /* 0x57C */ request_of_phase_process_class mPtlPhase; /* 0x584 */ mDoExt_bckAnm mBck; diff --git a/include/d/actor/d_a_obj_scannon_crs.h b/include/d/actor/d_a_obj_scannon_crs.h index d7eb7c8121..12369f58fd 100644 --- a/include/d/actor/d_a_obj_scannon_crs.h +++ b/include/d/actor/d_a_obj_scannon_crs.h @@ -51,7 +51,6 @@ public: static DUSK_GAME_DATA void (daSCannonCrs_c::*s_exeProc[])(daMidna_c*); -private: /* 0x574 */ cXyz mPortalWaitPos; /* 0x580 */ dMsgFlow_c mMsgFlow; /* 0x5CC */ mDoExt_bckAnm mBck; diff --git a/include/d/actor/d_a_obj_scannon_ten.h b/include/d/actor/d_a_obj_scannon_ten.h index 7bc5b24ed8..ce6c840cfe 100644 --- a/include/d/actor/d_a_obj_scannon_ten.h +++ b/include/d/actor/d_a_obj_scannon_ten.h @@ -60,7 +60,6 @@ public: static DUSK_GAME_DATA const ExeProc s_exeProc[]; static DUSK_GAME_DATA const ExeProc s_demoExeProc[][2]; -private: /* 0x574 */ J3DModel* mpModel; /* 0x578 */ mDoExt_bckAnm mBck; /* 0x594 */ dBgW* mpBgW; diff --git a/include/d/actor/d_a_obj_sekidoor.h b/include/d/actor/d_a_obj_sekidoor.h index 46da5cb8a9..8f2791a673 100644 --- a/include/d/actor/d_a_obj_sekidoor.h +++ b/include/d/actor/d_a_obj_sekidoor.h @@ -59,7 +59,6 @@ public: void open() { mOpening = true; } bool chkDestroy() { return (mDestroyed == true); } -private: /* 0x5A0 */ OBJ_SEKIDOOR_HIO_CLASS* mpHIO; /* 0x5A4 */ request_of_phase_process_class mPhaseReq; /* 0x5AC */ J3DModel* mpModel; diff --git a/include/d/actor/d_a_obj_sekizo.h b/include/d/actor/d_a_obj_sekizo.h index 0f0847dc24..2011417a96 100644 --- a/include/d/actor/d_a_obj_sekizo.h +++ b/include/d/actor/d_a_obj_sekizo.h @@ -50,7 +50,6 @@ public: void initBaseMtx(); void setBaseMtx(); -private: /* 0x5A0 */ OBJ_SEKIZO_HIO_CLASS* mpHIO; /* 0x5A4 */ request_of_phase_process_class mPhaseReq; /* 0x5AC */ J3DModel* mpModel; diff --git a/include/d/actor/d_a_obj_shield.h b/include/d/actor/d_a_obj_shield.h index 11b4a2668d..248c26be5b 100644 --- a/include/d/actor/d_a_obj_shield.h +++ b/include/d/actor/d_a_obj_shield.h @@ -59,7 +59,6 @@ public: void setStatus(u8 status) { mStatus = status; } void setAction(u8 action) { mAction = action; } -private: /* 0x92C */ fpc_ProcID mItemId; /* 0x930 */ int mRotAngleCoeff; /* 0x934 */ u8 mStatus; diff --git a/include/d/actor/d_a_obj_sm_door.h b/include/d/actor/d_a_obj_sm_door.h index bec15a0ae8..7622ee0fa3 100644 --- a/include/d/actor/d_a_obj_sm_door.h +++ b/include/d/actor/d_a_obj_sm_door.h @@ -31,7 +31,6 @@ public: int Draw(); int Delete(); -private: /* 0x5A0 */ bool mUseAlphaModel; /* 0x5A1 */ u8 field_0x5a1[0x5AC - 0x5A1]; /* 0x5AC */ s16 mMode; diff --git a/include/d/actor/d_a_obj_smallkey.h b/include/d/actor/d_a_obj_smallkey.h index 2becc9bae2..7bf38de4af 100644 --- a/include/d/actor/d_a_obj_smallkey.h +++ b/include/d/actor/d_a_obj_smallkey.h @@ -14,7 +14,7 @@ * */ class daKey_c : public daItemBase_c { -private: +public: void seStartTwinkle_private(u32); public: diff --git a/include/d/actor/d_a_obj_smgdoor.h b/include/d/actor/d_a_obj_smgdoor.h index aad2800ece..b22734b3e3 100644 --- a/include/d/actor/d_a_obj_smgdoor.h +++ b/include/d/actor/d_a_obj_smgdoor.h @@ -53,7 +53,6 @@ public: virtual int Draw(); virtual int Delete(); -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mpModel[2]; /* 0x5B0 */ s16 field_0x5b0; diff --git a/include/d/actor/d_a_obj_smoke.h b/include/d/actor/d_a_obj_smoke.h index 61a3b56a51..abd172afbe 100644 --- a/include/d/actor/d_a_obj_smoke.h +++ b/include/d/actor/d_a_obj_smoke.h @@ -24,7 +24,6 @@ public: int execute(); int _delete(); -private: /* 0x568 */ JPABaseEmitter* mParticle; }; diff --git a/include/d/actor/d_a_obj_smtile.h b/include/d/actor/d_a_obj_smtile.h index 735914f0a0..c85000e7b8 100644 --- a/include/d/actor/d_a_obj_smtile.h +++ b/include/d/actor/d_a_obj_smtile.h @@ -41,7 +41,7 @@ public: * */ class daObj_SMTile_c : public fopAc_ac_c { -private: +public: /* 0x568 */ mDoExt_brkAnm mBrk; /* 0x580 */ OBJ_SMTILE_HIO_CLASS* mpHIO; /* 0x584 */ request_of_phase_process_class mPhase; diff --git a/include/d/actor/d_a_obj_smw_stone.h b/include/d/actor/d_a_obj_smw_stone.h index 02f58284ff..05913cd339 100644 --- a/include/d/actor/d_a_obj_smw_stone.h +++ b/include/d/actor/d_a_obj_smw_stone.h @@ -29,7 +29,6 @@ public: u8 getSwBit0() { return fopAcM_GetParamBit(this, 0, 8); } void deleteStone() { mDelete = true; } -private: /* 0x574 */ cBgS_PolyInfo mPolyInfo; /* 0x584 */ J3DModel* mpModel; /* 0x588 */ dBgW* mpBgW; diff --git a/include/d/actor/d_a_obj_snowEffTag.h b/include/d/actor/d_a_obj_snowEffTag.h index 748106cc81..bc995c749c 100644 --- a/include/d/actor/d_a_obj_snowEffTag.h +++ b/include/d/actor/d_a_obj_snowEffTag.h @@ -23,7 +23,6 @@ public: int getArg0() { return fopAcM_GetParamBit(this, 0, 8); } -private: /* 0x568 */ u8 field_0x568; /* 0x569 */ bool mPlayedSound; /* 0x56C */ f32 mMaxSize; diff --git a/include/d/actor/d_a_obj_snow_soup.h b/include/d/actor/d_a_obj_snow_soup.h index 91c23c8f85..3b96cd566f 100644 --- a/include/d/actor/d_a_obj_snow_soup.h +++ b/include/d/actor/d_a_obj_snow_soup.h @@ -28,7 +28,6 @@ public: void createSmkEmtChange(int); void deleteSmkEmtChange(int); -private: /* 0x574 */ cXyz mFirewoodPos; /* 0x580 */ cXyz mBubblePos; /* 0x58C */ JPABaseEmitter* mpSmkEmtCommon[4]; diff --git a/include/d/actor/d_a_obj_spinLift.h b/include/d/actor/d_a_obj_spinLift.h index 548df3f910..d2f0a50b03 100644 --- a/include/d/actor/d_a_obj_spinLift.h +++ b/include/d/actor/d_a_obj_spinLift.h @@ -40,7 +40,6 @@ public: u8 getTimer() { return (current.angle.x & 0xff00) >> 8; } int getEndSw() { return fopAcM_GetParamBit(this, 8, 8); } -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ u8 field_0x5ac; diff --git a/include/d/actor/d_a_obj_ss_base.h b/include/d/actor/d_a_obj_ss_base.h index 4d275a43cd..2101dd3237 100644 --- a/include/d/actor/d_a_obj_ss_base.h +++ b/include/d/actor/d_a_obj_ss_base.h @@ -18,7 +18,6 @@ public: u16 getValueNumber() { return mValueNum; } void setValueNumber(u16 valueNum) { mValueNum = valueNum; } -private: /* 0x56C */ void* mpParentPtr; /* 0x570 */ u16 field_0x570; /* 0x572 */ u16 mFlowNodeNum; diff --git a/include/d/actor/d_a_obj_ss_drink.h b/include/d/actor/d_a_obj_ss_drink.h index e49644f6b6..c4c0a1a72b 100644 --- a/include/d/actor/d_a_obj_ss_drink.h +++ b/include/d/actor/d_a_obj_ss_drink.h @@ -50,7 +50,6 @@ public: static DUSK_GAME_DATA dCcD_SrcGObjInf const mCcDObjInfo; static DUSK_GAME_DATA dCcD_SrcCyl DUSK_CONST mCcDCyl; -private: /* 0x578 */ mDoExt_btpAnm* mpBtpAnm; /* 0x57C */ mDoExt_brkAnm* mpBrkAnm; /* 0x580 */ u8 field_0x580; diff --git a/include/d/actor/d_a_obj_ss_item.h b/include/d/actor/d_a_obj_ss_item.h index cd219a1832..59f8f56407 100644 --- a/include/d/actor/d_a_obj_ss_item.h +++ b/include/d/actor/d_a_obj_ss_item.h @@ -49,7 +49,6 @@ public: static DUSK_GAME_DATA dCcD_SrcGObjInf const mCcDObjInfo; static DUSK_GAME_DATA dCcD_SrcCyl DUSK_CONST mCcDCyl; -private: /* 0x578 */ request_of_phase_process_class mPhase; /* 0x580 */ J3DModel* mpModel; /* 0x584 */ dBgS_ObjAcch mAcch; diff --git a/include/d/actor/d_a_obj_stairBlock.h b/include/d/actor/d_a_obj_stairBlock.h index 3d3b8d5283..1b04d0bcc1 100644 --- a/include/d/actor/d_a_obj_stairBlock.h +++ b/include/d/actor/d_a_obj_stairBlock.h @@ -26,7 +26,6 @@ public: static DUSK_GAME_DATA dCcD_SrcGObjInf const mCcDObjInfo; static DUSK_GAME_DATA dCcD_SrcSph mCcDSph; -private: /* 0x056C */ request_of_phase_process_class mPhaseReq; /* 0x0574 */ J3DModel* mpModel[10]; /* 0x059C */ mDoExt_bckAnm mBckAnm[10]; diff --git a/include/d/actor/d_a_obj_stick.h b/include/d/actor/d_a_obj_stick.h index ebc08e08b8..ce72273254 100644 --- a/include/d/actor/d_a_obj_stick.h +++ b/include/d/actor/d_a_obj_stick.h @@ -45,7 +45,7 @@ public: * */ class daObj_Stick_c : public fopAc_ac_c { -private: +public: /* 0x568 */ OBJ_STICK_HIO_CLASS* mpHIO; /* 0x56c */ request_of_phase_process_class mPhase; /* 0x574 */ J3DModel* mpModel; diff --git a/include/d/actor/d_a_obj_stone.h b/include/d/actor/d_a_obj_stone.h index b5f4da8c39..dfeb11f539 100644 --- a/include/d/actor/d_a_obj_stone.h +++ b/include/d/actor/d_a_obj_stone.h @@ -56,7 +56,6 @@ public: int draw(); int _delete(); -private: /* 0x0568 */ request_of_phase_process_class mPhase; /* 0x0570 */ J3DModel* mpModel; /* 0x0574 */ dBgS_ObjAcch mChkObj; diff --git a/include/d/actor/d_a_obj_stoneMark.h b/include/d/actor/d_a_obj_stoneMark.h index fbe56ce31d..04540fd9c7 100644 --- a/include/d/actor/d_a_obj_stoneMark.h +++ b/include/d/actor/d_a_obj_stoneMark.h @@ -23,7 +23,6 @@ public: int draw(); int _delete(); -private: /* 0x0568 */ request_of_phase_process_class mpPhase; /* 0x0570 */ TGXTexObj mTexObj; /* 0x0590 */ dBgS_ObjAcch mObjAcch; diff --git a/include/d/actor/d_a_obj_stopper.h b/include/d/actor/d_a_obj_stopper.h index 9a100c754b..62eda0ae39 100644 --- a/include/d/actor/d_a_obj_stopper.h +++ b/include/d/actor/d_a_obj_stopper.h @@ -59,7 +59,6 @@ public: u8 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); } u8 getSwNo2() { return fopAcM_GetParamBit(this, 8, 8); } -private: /* 0x5A0 */ u8 field_0x5a0[8]; // unused /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ dBgS_ObjAcch mAcch; diff --git a/include/d/actor/d_a_obj_stopper2.h b/include/d/actor/d_a_obj_stopper2.h index 7ec86cb818..ccae3af298 100644 --- a/include/d/actor/d_a_obj_stopper2.h +++ b/include/d/actor/d_a_obj_stopper2.h @@ -35,7 +35,6 @@ public: 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 mOffsetY; diff --git a/include/d/actor/d_a_obj_suisya.h b/include/d/actor/d_a_obj_suisya.h index c92146f5af..59067d84a4 100644 --- a/include/d/actor/d_a_obj_suisya.h +++ b/include/d/actor/d_a_obj_suisya.h @@ -20,7 +20,6 @@ public: int CreateHeap(); int create(); -private: /* 0x568 */ request_of_phase_process_class mPhase; /* 0x570 */ J3DModel* mpModel; /* 0x574 */ u32 mShadowKey; diff --git a/include/d/actor/d_a_obj_swBallA.h b/include/d/actor/d_a_obj_swBallA.h index 1785565a4e..910c031050 100644 --- a/include/d/actor/d_a_obj_swBallA.h +++ b/include/d/actor/d_a_obj_swBallA.h @@ -41,7 +41,6 @@ public: void onFlag(u8 idx, u8 val) { field_0x5af[idx] |= val; } u8 checkFlag(u8 idx, u8 val) { return field_0x5af[idx] & val; } -private: /* 0x57C */ request_of_phase_process_class field_0x57c; /* 0x584 */ J3DModel* mModel; /* 0x588 */ mDoExt_btkAnm* field_0x588; diff --git a/include/d/actor/d_a_obj_swBallB.h b/include/d/actor/d_a_obj_swBallB.h index 31a7971232..31a8f4210e 100644 --- a/include/d/actor/d_a_obj_swBallB.h +++ b/include/d/actor/d_a_obj_swBallB.h @@ -44,7 +44,6 @@ public: void setLightOn() { field_0x5ac = 1; } void setLightOff() { field_0x5ad = 1; } -private: /* 0x57C */ request_of_phase_process_class field_0x57c; /* 0x584 */ J3DModel* mModel; /* 0x588 */ mDoExt_btkAnm* field_0x588; diff --git a/include/d/actor/d_a_obj_swLight.h b/include/d/actor/d_a_obj_swLight.h index 1a9fc50cca..9d84030e96 100644 --- a/include/d/actor/d_a_obj_swLight.h +++ b/include/d/actor/d_a_obj_swLight.h @@ -47,7 +47,6 @@ public: u8 getOnTime() { return fopAcM_GetParamBit(this, 16, 8); } u8 getEvent() { return (u8)field_0xb22; } -private: /* 0x5B0 */ request_of_phase_process_class mPhase; /* 0x5B8 */ J3DModel* mpModel; /* 0x6F4 */ dCcD_Stts mStts; diff --git a/include/d/actor/d_a_obj_swchain.h b/include/d/actor/d_a_obj_swchain.h index 270fb8f5ab..8bd68b4478 100644 --- a/include/d/actor/d_a_obj_swchain.h +++ b/include/d/actor/d_a_obj_swchain.h @@ -80,7 +80,6 @@ public: return FALSE; } -private: /* 0x568 */ request_of_phase_process_class mPhase; /* 0x570 */ J3DModel* mpModel; /* 0x574 */ J3DModelData* mChainModelData; diff --git a/include/d/actor/d_a_obj_swhang.h b/include/d/actor/d_a_obj_swhang.h index 097da890b3..37ddbb3ea2 100644 --- a/include/d/actor/d_a_obj_swhang.h +++ b/include/d/actor/d_a_obj_swhang.h @@ -78,7 +78,6 @@ public: u16 checkFlag(u16 flag) { return mFlags & flag; } s16 getAngleY() { return shape_angle.y; } -private: /* 0x5B0 */ request_of_phase_process_class mPhase; /* 0x5B8 */ J3DModel* mpModel; /* 0x5BC */ dCcD_Stts mCcStts; diff --git a/include/d/actor/d_a_obj_sword.h b/include/d/actor/d_a_obj_sword.h index 163175ddec..63bc7d576a 100644 --- a/include/d/actor/d_a_obj_sword.h +++ b/include/d/actor/d_a_obj_sword.h @@ -31,7 +31,6 @@ public: u8 getSwbit() { return fopAcM_GetParamBit(this, 8, 8); } void setStatus(u8 status) { mStatus = status; } -private: /* 0x92c */ u32 field_0x92c; /* 0x930 */ fpc_ProcID mProcID; /* 0x934 */ u8 mStatus; diff --git a/include/d/actor/d_a_obj_syRock.h b/include/d/actor/d_a_obj_syRock.h index 2c881585ed..3fa10456f8 100644 --- a/include/d/actor/d_a_obj_syRock.h +++ b/include/d/actor/d_a_obj_syRock.h @@ -46,7 +46,6 @@ public: static DUSK_GAME_DATA dCcD_SrcGObjInf const mCcDObjInfo; static DUSK_GAME_DATA dCcD_SrcCyl mCcDCyl; -private: /* 0x5B8 */ request_of_phase_process_class mPhase; /* 0x5C0 */ J3DModel* mpModels[2]; /* 0x5C8 */ u8 mMode; diff --git a/include/d/actor/d_a_obj_szbridge.h b/include/d/actor/d_a_obj_szbridge.h index eff6a17a9c..8702506280 100644 --- a/include/d/actor/d_a_obj_szbridge.h +++ b/include/d/actor/d_a_obj_szbridge.h @@ -25,7 +25,6 @@ public: int Delete(); virtual ~daObjSZbridge_c() {} -private: /* 0x5A8 */ Mtx mBgMtx; /* 0x5D8 */ Mtx field_0x5d8; /* 0x608 */ J3DModel* mpModel; diff --git a/include/d/actor/d_a_obj_table.h b/include/d/actor/d_a_obj_table.h index cea036783c..44de1d1a47 100644 --- a/include/d/actor/d_a_obj_table.h +++ b/include/d/actor/d_a_obj_table.h @@ -27,7 +27,6 @@ public: s16 getMessageNo() { return fopAcM_GetParam(this) & 0xFFFF; } -private: /* 0x5A0 */ J3DModel* mpModel; /* 0x5A4 */ request_of_phase_process_class mPhaseReq; /* 0x5AC */ dMsgFlow_c mMsgFlow; diff --git a/include/d/actor/d_a_obj_takaraDai.h b/include/d/actor/d_a_obj_takaraDai.h index b745683dd6..657e032bcc 100644 --- a/include/d/actor/d_a_obj_takaraDai.h +++ b/include/d/actor/d_a_obj_takaraDai.h @@ -26,7 +26,6 @@ public: u32 getSwBit() { return fopAcM_GetParamBit(this, 0, 8); } -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mpBaseModel; /* 0x5AC */ J3DModel* mpTopModel; diff --git a/include/d/actor/d_a_obj_tgake.h b/include/d/actor/d_a_obj_tgake.h index 1871794df9..6862ad4979 100644 --- a/include/d/actor/d_a_obj_tgake.h +++ b/include/d/actor/d_a_obj_tgake.h @@ -28,7 +28,6 @@ public: 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; diff --git a/include/d/actor/d_a_obj_thashi.h b/include/d/actor/d_a_obj_thashi.h index 3796ee0629..1934b57c56 100644 --- a/include/d/actor/d_a_obj_thashi.h +++ b/include/d/actor/d_a_obj_thashi.h @@ -25,8 +25,6 @@ public: int Draw(); int Delete(); -// private: - /* 0x5A0 */ dBgW* unk5A0; /* 0x5A4 */ u32 unk5A4; /* 0x5A8 */ u32 unk5A8; diff --git a/include/d/actor/d_a_obj_timeFire.h b/include/d/actor/d_a_obj_timeFire.h index 62fb3460d9..0b7a5ab5ec 100644 --- a/include/d/actor/d_a_obj_timeFire.h +++ b/include/d/actor/d_a_obj_timeFire.h @@ -28,7 +28,6 @@ public: u8 getEndTime() { return fopAcM_GetParamBit(this, 16, 8); } u8 getScale() { return fopAcM_GetParamBit(this, 24, 8); } -private: /* 0x568 */ u8 field_0x568; /* 0x569 */ u8 field_0x569; /* 0x56A */ u8 mStartTime; diff --git a/include/d/actor/d_a_obj_timer.h b/include/d/actor/d_a_obj_timer.h index 120a23b3a9..5778bf5ca1 100644 --- a/include/d/actor/d_a_obj_timer.h +++ b/include/d/actor/d_a_obj_timer.h @@ -54,7 +54,6 @@ class Act_c : public fopAc_ac_c { return daObj::PrmAbstract(this, PRM_2, PRM_24); } - private: /* 0x568 */ int field_0x568; /* 0x56C */ int field_0x56c; /* 0x570 */ u8 field_0x570; diff --git a/include/d/actor/d_a_obj_tmoon.h b/include/d/actor/d_a_obj_tmoon.h index 4bf3c3620c..2992316782 100644 --- a/include/d/actor/d_a_obj_tmoon.h +++ b/include/d/actor/d_a_obj_tmoon.h @@ -25,7 +25,6 @@ public: 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; diff --git a/include/d/actor/d_a_obj_toaru_maki.h b/include/d/actor/d_a_obj_toaru_maki.h index 4f7e8d2645..d980f9410f 100644 --- a/include/d/actor/d_a_obj_toaru_maki.h +++ b/include/d/actor/d_a_obj_toaru_maki.h @@ -25,7 +25,6 @@ public: u32 getNameArg_0() { return fopAcM_GetParamBit(this, 0, 4); } -private: /* 0x574 */ J3DModel* mpModel; /* 0x578 */ dBgW* mpBgW; /* 0x57C */ Mtx mMtx; diff --git a/include/d/actor/d_a_obj_togeTrap.h b/include/d/actor/d_a_obj_togeTrap.h index 4055d6a42e..a67451ea0a 100644 --- a/include/d/actor/d_a_obj_togeTrap.h +++ b/include/d/actor/d_a_obj_togeTrap.h @@ -47,7 +47,6 @@ public: static DUSK_GAME_DATA dCcD_SrcGObjInf const mCcDObjInfo; static DUSK_GAME_DATA dCcD_SrcCyl mCcDCyl; -private: /* 0x5A0 */ dCcD_Stts mStts; /* 0x5DC */ dCcD_Cyl mCyls[4]; /* 0xACC */ request_of_phase_process_class mPhase; diff --git a/include/d/actor/d_a_obj_tombo.h b/include/d/actor/d_a_obj_tombo.h index 5dfdcb6451..288d35611e 100644 --- a/include/d/actor/d_a_obj_tombo.h +++ b/include/d/actor/d_a_obj_tombo.h @@ -48,7 +48,6 @@ public: inline int Draw(); -private: /* 0x590 */ dCcD_Stts mStts; /* 0x5CC */ dCcD_Sph mSph; /* 0x704 */ daPy_boomerangMove_c mBoomerangMove; diff --git a/include/d/actor/d_a_obj_tornado.h b/include/d/actor/d_a_obj_tornado.h index 30e8e2c1e3..c3330d73f9 100644 --- a/include/d/actor/d_a_obj_tornado.h +++ b/include/d/actor/d_a_obj_tornado.h @@ -30,7 +30,6 @@ public: u8 getTimer() { return fopAcM_GetParamBit(this, 0, 8); } u8 getSwbit() { return fopAcM_GetParamBit(this, 0x18, 8); } -private: /* 0x568 */ dCcD_Stts mStts; /* 0x5A4 */ dCcD_Cps mCps; /* 0x6E8 */ cM3dGCpsS mWindCps; diff --git a/include/d/actor/d_a_obj_twGate.h b/include/d/actor/d_a_obj_twGate.h index 683a7f18fb..0a00c2b834 100644 --- a/include/d/actor/d_a_obj_twGate.h +++ b/include/d/actor/d_a_obj_twGate.h @@ -23,7 +23,6 @@ public: int getGateType() { return fopAcM_GetParamBit(this, 4, 8); } -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mModel; /* 0x5AC */ mDoExt_btkAnm mBtk; diff --git a/include/d/actor/d_a_obj_vground.h b/include/d/actor/d_a_obj_vground.h index fed893aef1..bd9e266ebf 100644 --- a/include/d/actor/d_a_obj_vground.h +++ b/include/d/actor/d_a_obj_vground.h @@ -24,7 +24,6 @@ public: u32 getSwbit() { return (u8) fopAcM_GetParamBit(this, 0, 8); } -private: /* 0x568 */ request_of_phase_process_class mPhaseReq; /* 0x570 */ J3DModel* mpModel; /* 0x574 */ mDoExt_btkAnm* mpBtk; diff --git a/include/d/actor/d_a_obj_volcball.h b/include/d/actor/d_a_obj_volcball.h index ddd299a26e..cb1e895e8f 100644 --- a/include/d/actor/d_a_obj_volcball.h +++ b/include/d/actor/d_a_obj_volcball.h @@ -113,7 +113,6 @@ public: void setAction(u8 i_action) { mMode = i_action; } -private: /* 0x057C */ request_of_phase_process_class mPhase; /* 0x0584 */ dBgS_AcchCir mAcchCir; /* 0x05C4 */ dCcD_Stts mCcStts; diff --git a/include/d/actor/d_a_obj_volcbom.h b/include/d/actor/d_a_obj_volcbom.h index 17f9db911d..60401dca2d 100644 --- a/include/d/actor/d_a_obj_volcbom.h +++ b/include/d/actor/d_a_obj_volcbom.h @@ -84,7 +84,6 @@ public: u8 getArg0() { return fopAcM_GetParamBit(this, 16, 8); } u16 getMsgID() { return mMsgID; } -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mModel1; /* 0x5AC */ mDoExt_btkAnm* mBtk1; diff --git a/include/d/actor/d_a_obj_waterGate.h b/include/d/actor/d_a_obj_waterGate.h index 66a076be78..ae81773aec 100644 --- a/include/d/actor/d_a_obj_waterGate.h +++ b/include/d/actor/d_a_obj_waterGate.h @@ -33,7 +33,6 @@ public: int Draw(); int Delete(); -private: /* 0x5A0 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ u8 mMode; diff --git a/include/d/actor/d_a_obj_waterPillar.h b/include/d/actor/d_a_obj_waterPillar.h index 19b55971e8..987abc3923 100644 --- a/include/d/actor/d_a_obj_waterPillar.h +++ b/include/d/actor/d_a_obj_waterPillar.h @@ -76,7 +76,6 @@ public: mStartStalactiteShake = false; } -private: /* 0x584 */ request_of_phase_process_class mPhase; /* 0x58C */ J3DModel* mpModel; /* 0x590 */ mDoExt_btkAnm mVTexScrollAnm; diff --git a/include/d/actor/d_a_obj_waterfall.h b/include/d/actor/d_a_obj_waterfall.h index e7c143910d..7a69938455 100644 --- a/include/d/actor/d_a_obj_waterfall.h +++ b/include/d/actor/d_a_obj_waterfall.h @@ -24,7 +24,6 @@ public: void push_player(); int draw(); int _delete(); -private: /* 0x568 */ request_of_phase_process_class mPhase; /* 0x570 */ u8 pad[4]; /* 0x574 */ dCcD_Stts mCylColliderStts; diff --git a/include/d/actor/d_a_obj_wchain.h b/include/d/actor/d_a_obj_wchain.h index b9f791d058..d9377d327a 100644 --- a/include/d/actor/d_a_obj_wchain.h +++ b/include/d/actor/d_a_obj_wchain.h @@ -57,7 +57,6 @@ public: mDown = true; } -private: /* 0x568 */ request_of_phase_process_class mPhaseReq; /* 0x570 */ J3DModel* mpHandleModel; /* 0x574 */ J3DModelData* mpChainModelData; diff --git a/include/d/actor/d_a_obj_wdStick.h b/include/d/actor/d_a_obj_wdStick.h index 08bc2a1faf..e68f5a4a8e 100644 --- a/include/d/actor/d_a_obj_wdStick.h +++ b/include/d/actor/d_a_obj_wdStick.h @@ -53,7 +53,6 @@ public: static DUSK_GAME_DATA dCcD_SrcGObjInf const mCcDObjInfo; static DUSK_GAME_DATA dCcD_SrcSph mCcDSph; -private: /* 0x56C */ request_of_phase_process_class mPhase; /* 0x574 */ J3DModel* mModel; /* 0x578 */ u8 mMode; diff --git a/include/d/actor/d_a_obj_well_cover.h b/include/d/actor/d_a_obj_well_cover.h index b25ad59abe..f4fb2250d0 100644 --- a/include/d/actor/d_a_obj_well_cover.h +++ b/include/d/actor/d_a_obj_well_cover.h @@ -29,7 +29,6 @@ public: u8 getSwNo() { return fopAcM_GetParam(this); } -private: /* 0x5A0 */ request_of_phase_process_class mPhaseReq; /* 0x5A8 */ J3DModel* mpModel; /* 0x5AC */ u8 field_0x5AC[0x5B0 - 0x5AC]; diff --git a/include/d/actor/d_a_obj_wind_stone.h b/include/d/actor/d_a_obj_wind_stone.h index f5e52dfc94..107cecc92c 100644 --- a/include/d/actor/d_a_obj_wind_stone.h +++ b/include/d/actor/d_a_obj_wind_stone.h @@ -36,7 +36,6 @@ public: 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; diff --git a/include/d/actor/d_a_obj_window.h b/include/d/actor/d_a_obj_window.h index 83b62740a4..8d1b0412d7 100644 --- a/include/d/actor/d_a_obj_window.h +++ b/include/d/actor/d_a_obj_window.h @@ -27,7 +27,6 @@ public: 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/d/actor/d_a_obj_wood_pendulum.h b/include/d/actor/d_a_obj_wood_pendulum.h index 1a1ee024b3..9ee5126ad8 100644 --- a/include/d/actor/d_a_obj_wood_pendulum.h +++ b/include/d/actor/d_a_obj_wood_pendulum.h @@ -26,7 +26,6 @@ public: 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; diff --git a/include/d/actor/d_a_obj_wood_statue.h b/include/d/actor/d_a_obj_wood_statue.h index c0214679db..3ddd94bc62 100644 --- a/include/d/actor/d_a_obj_wood_statue.h +++ b/include/d/actor/d_a_obj_wood_statue.h @@ -52,7 +52,6 @@ public: void setStatus(u8 status) { mStatus = status; } u8 getSwbit2() { return fopAcM_GetParamBit(this, 8, 8); } -private: /* 0x92C */ fpc_ProcID mItemId; /* 0x930 */ int field_0x930; /* 0x934 */ int mStaffIdx; diff --git a/include/d/actor/d_a_obj_wsword.h b/include/d/actor/d_a_obj_wsword.h index aa611af336..2860313c19 100644 --- a/include/d/actor/d_a_obj_wsword.h +++ b/include/d/actor/d_a_obj_wsword.h @@ -25,7 +25,6 @@ public: int draw(); int _delete(); -private: /* 0x568 */ request_of_phase_process_class mPhaseReq; /* 0x570 */ J3DModel* mpModel; /* 0x574 */ dBgS_ObjAcch mAcch; diff --git a/include/d/actor/d_a_obj_yel_bag.h b/include/d/actor/d_a_obj_yel_bag.h index caeba24ae5..9c3f452a11 100644 --- a/include/d/actor/d_a_obj_yel_bag.h +++ b/include/d/actor/d_a_obj_yel_bag.h @@ -53,7 +53,7 @@ public: * */ class daObj_YBag_c : public fopAc_ac_c { -private: +public: /* 0x568 */ request_of_phase_process_class mPhases[3]; /* 0x580 */ J3DModel* mModel; /* 0x584 */ OBJ_YBAG_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_obj_yobikusa.h b/include/d/actor/d_a_obj_yobikusa.h index a3dfa944fa..ed1019c7ad 100644 --- a/include/d/actor/d_a_obj_yobikusa.h +++ b/include/d/actor/d_a_obj_yobikusa.h @@ -87,7 +87,6 @@ public: return var_r31 > 0; } -private: /* 0x568 */ J3DModel* mpActiveModel; /* 0x56C */ J3DModel* mpModelTypeA; /* 0x570 */ J3DModel* mpModelTypeB; diff --git a/include/d/actor/d_a_obj_zrTurara.h b/include/d/actor/d_a_obj_zrTurara.h index 679ae20635..c52a21f2cc 100644 --- a/include/d/actor/d_a_obj_zrTurara.h +++ b/include/d/actor/d_a_obj_zrTurara.h @@ -29,7 +29,6 @@ public: int Draw(); int Delete(); -private: /* 0x5A0 */ dCcD_Stts mCcStatus; /* 0x5DC */ dCcD_Cyl mCcCyl; /* 0x718 */ request_of_phase_process_class mPhaseReq; diff --git a/include/d/actor/d_a_obj_zrTuraraRock.h b/include/d/actor/d_a_obj_zrTuraraRock.h index 1f92de6e82..922948ee9c 100644 --- a/include/d/actor/d_a_obj_zrTuraraRock.h +++ b/include/d/actor/d_a_obj_zrTuraraRock.h @@ -30,7 +30,6 @@ public: int Draw(); int Delete(); -private: /* 0x568 */ dCcD_Stts mCcStatus; /* 0x5A4 */ dCcD_Sph mCcSph; /* 0x6DC */ request_of_phase_process_class mPhaseReq; diff --git a/include/d/actor/d_a_obj_zra_rock.h b/include/d/actor/d_a_obj_zra_rock.h index 586fc176c5..925c49a5ee 100644 --- a/include/d/actor/d_a_obj_zra_rock.h +++ b/include/d/actor/d_a_obj_zra_rock.h @@ -28,7 +28,6 @@ public: void setDemoStart() { mDemoStart = 1; } -private: friend class daNpc_zrZ_c; /* 0x5A0 */ request_of_phase_process_class mPhaseReq; diff --git a/include/d/actor/d_a_passer_mng.h b/include/d/actor/d_a_passer_mng.h index ced02d9d1d..a3aa50db35 100644 --- a/include/d/actor/d_a_passer_mng.h +++ b/include/d/actor/d_a_passer_mng.h @@ -259,7 +259,6 @@ public: static DUSK_GAME_DATA const Group* mGroupTbl[4]; -private: /* 0x568 */ fpc_ProcID* childProcIds; /* 0x56C */ dPath* mPath; /* 0x570 */ int startTime; diff --git a/include/d/actor/d_a_peru.h b/include/d/actor/d_a_peru.h index 771e879b10..8a997b7a85 100644 --- a/include/d/actor/d_a_peru.h +++ b/include/d/actor/d_a_peru.h @@ -189,7 +189,6 @@ public: static DUSK_GAME_DATA const char* mCutNameList[3]; static DUSK_GAME_DATA cutAppearFunc mCutList[3]; -private: /* 0x0E40 */ daNpcT_ActorMngr_c mActors[3]; /* 0x0E58 */ int field_0xe58; /* 0x0E5C */ actionFunc mActionFunc; diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h index ce6158fcf7..5028442f68 100644 --- a/include/d/actor/d_a_player.h +++ b/include/d/actor/d_a_player.h @@ -25,7 +25,6 @@ public: mNowSetFlg = 0; } -private: /* 0x14 */ u16 mEndFlg; /* 0x16 */ u16 mNowSetFlg; }; @@ -70,7 +69,6 @@ public: static DUSK_GAME_DATA s16 m_dropAngleY; static DUSK_GAME_DATA s16 m_eventKeepFlg; -private: /* 0x0 */ u8 field_0x0; /* 0x2 */ s16 field_0x2; /* 0x4 */ f32 m_offsetY; @@ -151,7 +149,6 @@ public: fopAc_ac_c* getActor() const { return mActor; } fopAc_ac_c* getActorConst() const { return mActor; } -private: /* 0x0 */ fpc_ProcID mID; /* 0x4 */ fopAc_ac_c* mActor; }; // Size: 0x8 @@ -296,7 +293,6 @@ public: void resetDemoType() { setDemoType(0); } void setStartDemoType() { setDemoType(DEMO_TYPE_START_e); } -private: /* 0x00 */ u16 mDemoType; /* 0x02 */ s16 mDemoMoveAngle; /* 0x04 */ s16 mTimer; diff --git a/include/d/actor/d_a_ppolamp.h b/include/d/actor/d_a_ppolamp.h index f1e1a9f26d..d55754d97b 100644 --- a/include/d/actor/d_a_ppolamp.h +++ b/include/d/actor/d_a_ppolamp.h @@ -25,7 +25,6 @@ public: void moveSwing(); void initParam(); -private: /* 0x574 */ J3DModel* mModel1; /* 0x578 */ J3DModel* mModel2; /* 0x57C */ mDoExt_bckAnm mBck; diff --git a/include/d/actor/d_a_spinner.h b/include/d/actor/d_a_spinner.h index 1dac4594a3..0ef81f3947 100644 --- a/include/d/actor/d_a_spinner.h +++ b/include/d/actor/d_a_spinner.h @@ -99,7 +99,6 @@ public: void forceDelete() { mDeleteFlg = true; } -private: /* 0x568 */ J3DModel* mpModel; /* 0x56C */ mDoExt_bckAnm mBck; /* 0x588 */ J3DAnmTransform* mpSpoutBck; diff --git a/include/d/actor/d_a_swBall.h b/include/d/actor/d_a_swBall.h index 74bfa90593..df4877e04b 100644 --- a/include/d/actor/d_a_swBall.h +++ b/include/d/actor/d_a_swBall.h @@ -30,7 +30,6 @@ public: u8 getType() { return fopAcM_GetParamBit(this, 24, 4); } bool checkPullLBall() { return fopAcM_GetParamBit(this, 28, 2) == 0; } -private: /* 0x568 */ fpc_ProcID mBallIDs[8]; /* 0x588 */ u8 mTimer; /* 0x589 */ u8 mAction; diff --git a/include/d/actor/d_a_swLBall.h b/include/d/actor/d_a_swLBall.h index 0a633fcb5b..c3d132a40f 100644 --- a/include/d/actor/d_a_swLBall.h +++ b/include/d/actor/d_a_swLBall.h @@ -42,7 +42,6 @@ public: return fopAcM_GetParamBit(this,28,2) == 0; } -private: /* 0x568 */ fpc_ProcID mProcIds[2]; /* 0x570 */ u8 mRunTimer; /* 0x571 */ u8 mAction; diff --git a/include/d/actor/d_a_swTime.h b/include/d/actor/d_a_swTime.h index b3b96fa104..f61d5a5e7f 100644 --- a/include/d/actor/d_a_swTime.h +++ b/include/d/actor/d_a_swTime.h @@ -30,7 +30,6 @@ public: int execute(); int _delete(); -private: /* 0x568 */ u8 mTime; /* 0x569 */ u8 mSwbit; /* 0x56A */ u8 mSwbit2; diff --git a/include/d/actor/d_a_tag_CstaSw.h b/include/d/actor/d_a_tag_CstaSw.h index b40a9d178e..e73fd18662 100644 --- a/include/d/actor/d_a_tag_CstaSw.h +++ b/include/d/actor/d_a_tag_CstaSw.h @@ -16,7 +16,6 @@ public: u32 getSw() { return fopAcM_GetParamBit(this, 0, 8); } -private: /* 0x568 */ u8 mSwitch; /* 0x569 */ u8 unused[0x570 - 0x569]; diff --git a/include/d/actor/d_a_tag_TWgate.h b/include/d/actor/d_a_tag_TWgate.h index 1886690db2..683d01449b 100644 --- a/include/d/actor/d_a_tag_TWgate.h +++ b/include/d/actor/d_a_tag_TWgate.h @@ -118,7 +118,6 @@ public: #endif static DUSK_GAME_DATA const actionFunc ActionTable[][2]; -private: /* 0x568 */ mDoExt_McaMorfSO* mpMorf; /* 0x56C */ request_of_phase_process_class mPhaseZevArc; /* 0x574 */ request_of_phase_process_class mPhaseMdRes; diff --git a/include/d/actor/d_a_tag_bottle_item.h b/include/d/actor/d_a_tag_bottle_item.h index cd122c8cad..3cc2a274d4 100644 --- a/include/d/actor/d_a_tag_bottle_item.h +++ b/include/d/actor/d_a_tag_bottle_item.h @@ -8,7 +8,7 @@ class daTag_BottleItem_c; typedef int (daTag_BottleItem_c::*ProcessFunc)(void*); class daTag_BottleItem_c : public fopAc_ac_c { -private: +public: /* 0x0568 */ ProcessFunc mProcessFunc; /* 0x056C */ u16 mEventType; /* 0x0576 */ u8 mBottleItemType; diff --git a/include/d/actor/d_a_tag_chkpoint.h b/include/d/actor/d_a_tag_chkpoint.h index 4871ec3946..51fa95e17d 100644 --- a/include/d/actor/d_a_tag_chkpoint.h +++ b/include/d/actor/d_a_tag_chkpoint.h @@ -45,7 +45,6 @@ public: return cPhs_COMPLEATE_e; } -private: /* 0x568 */ u8 field_0x568[8]; /* 0x570 */ cXyz mVtxA; /* 0x57C */ cXyz mVtxB; diff --git a/include/d/actor/d_a_tag_evtarea.h b/include/d/actor/d_a_tag_evtarea.h index 4bf0ec404e..f83e034aa1 100644 --- a/include/d/actor/d_a_tag_evtarea.h +++ b/include/d/actor/d_a_tag_evtarea.h @@ -45,7 +45,6 @@ public: void noEffect() { field_0x56c = 1; } -private: /* 0x568 vtable */ /* 0x56C */ u8 field_0x56c; }; diff --git a/include/d/actor/d_a_tag_lv6CstaSw.h b/include/d/actor/d_a_tag_lv6CstaSw.h index 17b58e4b28..384d9bd6d9 100644 --- a/include/d/actor/d_a_tag_lv6CstaSw.h +++ b/include/d/actor/d_a_tag_lv6CstaSw.h @@ -16,7 +16,6 @@ public: u32 getSw() { return fopAcM_GetParamBit(this, 0, 8); } -private: /* 0x568 */ u8 mSwitch; /* 0x569 */ u8 unused[0x570 - 0x569]; }; diff --git a/include/d/actor/d_a_tag_mhint.h b/include/d/actor/d_a_tag_mhint.h index e4c5260079..c573467ae0 100644 --- a/include/d/actor/d_a_tag_mhint.h +++ b/include/d/actor/d_a_tag_mhint.h @@ -26,7 +26,6 @@ public: NULL); } -private: /* 0x568 */ u8 field_0x568; /* 0x569 */ u8 mSwitch; /* 0x56A */ u8 field_0x56a; diff --git a/include/d/actor/d_a_tag_mmsg.h b/include/d/actor/d_a_tag_mmsg.h index 9fdd0b3c66..bcafa0c37d 100644 --- a/include/d/actor/d_a_tag_mmsg.h +++ b/include/d/actor/d_a_tag_mmsg.h @@ -14,7 +14,6 @@ public: void onUseFlg() { mUseFlg = true; } bool checkNoAttention() const { return mAttention == 0xFF; } -private: /* 0x568 */ u8 field_0x568; /* 0x569 */ u8 field_0x569; /* 0x56A */ u8 mAttention; diff --git a/include/d/actor/d_a_tag_mstop.h b/include/d/actor/d_a_tag_mstop.h index dd27dbb005..774af17007 100644 --- a/include/d/actor/d_a_tag_mstop.h +++ b/include/d/actor/d_a_tag_mstop.h @@ -17,7 +17,6 @@ public: int execute(); bool checkNoAttention() const { return field_0x56b == 0xFF; } -private: /* 0x568 */ u8 field_0x568; /* 0x569 */ u8 mSwitch; /* 0x56A */ u8 field_0x56a; diff --git a/include/d/actor/d_a_tag_myna2.h b/include/d/actor/d_a_tag_myna2.h index 7eecb0c1d7..70605612e3 100644 --- a/include/d/actor/d_a_tag_myna2.h +++ b/include/d/actor/d_a_tag_myna2.h @@ -12,7 +12,6 @@ public: int getMode() { return fopAcM_GetParam(this) & 0xFF; } f32 getExtent() { return scale.x * 100.0f;} -private: /* 0x568 */ u32 mSwitchNo; /* 0x56C */ u32 mMode; /* 0x570 */ s16 mTimer; diff --git a/include/d/actor/d_a_tag_setBall.h b/include/d/actor/d_a_tag_setBall.h index 6e75928c6b..0619e2a677 100644 --- a/include/d/actor/d_a_tag_setBall.h +++ b/include/d/actor/d_a_tag_setBall.h @@ -16,7 +16,6 @@ public: s32 getType() { return mType; } -private: u8 getType_private() { return fopAcM_GetParamBit(this, 8, 4); } /* 0x568 */ u8 mType; diff --git a/include/d/actor/d_a_tag_statue_evt.h b/include/d/actor/d_a_tag_statue_evt.h index 1bdc0d4f52..59237c09eb 100644 --- a/include/d/actor/d_a_tag_statue_evt.h +++ b/include/d/actor/d_a_tag_statue_evt.h @@ -25,7 +25,6 @@ public: int draw(); int _delete(); -private: /* 0x568 */ request_of_phase_process_class mArcPhase; /* 0x570 */ request_of_phase_process_class mEvArcPhase; /* 0x578 */ J3DModel* mpModel; diff --git a/include/d/actor/d_a_tag_telop.h b/include/d/actor/d_a_tag_telop.h index 6e28231138..0d6fbeb7a1 100644 --- a/include/d/actor/d_a_tag_telop.h +++ b/include/d/actor/d_a_tag_telop.h @@ -13,7 +13,6 @@ public: u16 getMessageNo() { return home.angle.z; } -private: /* 0x568 */ u16 mMessageNo; /* 0x56C */ int mMessageStatus; }; diff --git a/include/d/actor/d_a_tag_waterfall.h b/include/d/actor/d_a_tag_waterfall.h index 80ffe7bec2..6076e53042 100644 --- a/include/d/actor/d_a_tag_waterfall.h +++ b/include/d/actor/d_a_tag_waterfall.h @@ -22,7 +22,6 @@ public: int _delete(); cPhs_Step create(); -private: /* 0x568 */ f32 mCylinderRadiusA; /* 0x56C */ f32 mCylinderRadiusB; /* 0x570 */ f32 mCylinderHeight; diff --git a/include/d/actor/d_a_tag_yami.h b/include/d/actor/d_a_tag_yami.h index 8410899186..fc17586688 100644 --- a/include/d/actor/d_a_tag_yami.h +++ b/include/d/actor/d_a_tag_yami.h @@ -36,7 +36,6 @@ public: 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/include/d/actor/d_a_talk.h b/include/d/actor/d_a_talk.h index 9c86f88610..b7715d88cd 100644 --- a/include/d/actor/d_a_talk.h +++ b/include/d/actor/d_a_talk.h @@ -22,7 +22,6 @@ public: u16 getStatus(); u32 messageSet(); -private: /* 0x568 */ dMsgFlow_c mMsgFlow; /* 0x5B4 */ u32 mMessageID; }; diff --git a/include/d/actor/d_a_tbox.h b/include/d/actor/d_a_tbox.h index 6d0528d29d..6b07594577 100644 --- a/include/d/actor/d_a_tbox.h +++ b/include/d/actor/d_a_tbox.h @@ -148,7 +148,6 @@ public: field_0x9fc = 1; } -private: /* 0x718 */ u8 field_0x718; /* 0x71C */ request_of_phase_process_class mPhase; /* 0x724 */ J3DModel* mpModel; diff --git a/include/d/actor/d_a_tbox2.h b/include/d/actor/d_a_tbox2.h index 5e3989db57..29df2d8389 100644 --- a/include/d/actor/d_a_tbox2.h +++ b/include/d/actor/d_a_tbox2.h @@ -67,7 +67,6 @@ public: u8 getModelType() { return fopAcM_GetParamBit(this, 8, 4); } u8 getItemNo() { return fopAcM_GetParamBit(this, 0, 8); } -// private: /* 0x718 */ u8 mReturnRupee; /* 0x71C */ request_of_phase_process_class mPhase; /* 0x724 */ J3DModel* mpModel; diff --git a/include/d/actor/d_a_title.h b/include/d/actor/d_a_title.h index 465fe689c1..691e2df3e3 100644 --- a/include/d/actor/d_a_title.h +++ b/include/d/actor/d_a_title.h @@ -50,7 +50,6 @@ public: void KeyWaitPosMove(); #endif -private: /* 0x568 */ request_of_phase_process_class mPhaseReq; /* 0x570 */ JKRHeap* mpHeap; /* 0x574 */ J3DModel* mpModel; diff --git a/include/d/d_a_shop_item_static.h b/include/d/d_a_shop_item_static.h index 7126578092..e79973fc65 100644 --- a/include/d/d_a_shop_item_static.h +++ b/include/d/d_a_shop_item_static.h @@ -107,7 +107,6 @@ public: SHOP_ITEMNO_MAX, }; -private: /* 0x92C */ Mtx mMtx; /* 0x95C */ int field_0x95c; /* 0x960 */ s16 mAngleX; diff --git a/include/d/d_attention.h b/include/d/d_attention.h index 8e3b8be1f5..b1c269651f 100644 --- a/include/d/d_attention.h +++ b/include/d/d_attention.h @@ -18,7 +18,6 @@ public: fopAc_ac_c* getZHintTarget() { return convPId(field_0x8); } -private: /* 0x0 */ fpc_ProcID mHintActorID; /* 0x4 */ int mPriority; /* 0x8 */ fpc_ProcID field_0x8; @@ -34,7 +33,6 @@ public: fopAc_ac_c* getCatghTarget() { return convPId(mCatghTargetID); } u8 getChangeItem() { return mChangeItem; } -private: /* 0x00 */ fpc_ProcID mRequestActorID; /* 0x04 */ int field_0x4; /* 0x08 */ f32 mDistance; @@ -120,7 +118,6 @@ public: fopAc_ac_c* getLookTarget() { return convPId(mLookTargetID); } -private: fpc_ProcID mRequestActorID; int field_0x4; f32 mDistance; diff --git a/include/d/d_bg_plc.h b/include/d/d_bg_plc.h index da360fd0e4..f5361ff883 100644 --- a/include/d/d_bg_plc.h +++ b/include/d/d_bg_plc.h @@ -20,7 +20,6 @@ public: static const int ZELDA_CODE_SIZE = sizeof(sBgPc); -private: /* 0x00 */ sBgPlc* m_base; }; diff --git a/include/d/d_bg_s_acch.h b/include/d/d_bg_s_acch.h index 04a388c61b..a1a1517cc4 100644 --- a/include/d/d_bg_s_acch.h +++ b/include/d/d_bg_s_acch.h @@ -13,7 +13,7 @@ class fopAc_ac_c; class dBgS_AcchCir : public cBgS_PolyInfo { -private: +public: /* 0x10 */ u32 m_flags; /* 0x14 */ cM3dGCir m_cir; /* 0x28 */ f32 m_wall_rr; @@ -197,7 +197,6 @@ public: f32 GetCx() const { return pm_pos->x; } f32 GetCz() const { return pm_pos->z; } -private: /* 0x02C */ u32 m_flags; /* 0x030 */ cXyz* pm_pos; /* 0x034 */ cXyz* pm_old_pos; @@ -237,7 +236,6 @@ public: /* 0x0DC */ dBgS_GndChk m_gnd; /* 0x130 */ dBgS_RoofChk m_roof; /* 0x180 */ dBgS_WtrChk m_wtr; -private: /* 0x1D4 */ u8 m_wtr_mode; }; // Size: 0x1D8 diff --git a/include/d/d_bg_s_grp_pass_chk.h b/include/d/d_bg_s_grp_pass_chk.h index eea3414b98..6253f67f18 100644 --- a/include/d/d_bg_s_grp_pass_chk.h +++ b/include/d/d_bg_s_grp_pass_chk.h @@ -25,7 +25,6 @@ public: void OnAll() { mGrp |= FULL_GRP; } u32 MaskNormalGrp() { return mGrp & NORMAL_GRP; } u32 MaskWaterGrp() { return mGrp & WATER_GRP; } -private: /* 0x4 */ u32 mGrp; }; diff --git a/include/d/d_bg_s_poly_pass_chk.h b/include/d/d_bg_s_poly_pass_chk.h index 6f7778189a..759321c6da 100644 --- a/include/d/d_bg_s_poly_pass_chk.h +++ b/include/d/d_bg_s_poly_pass_chk.h @@ -42,7 +42,6 @@ public: void SetStatue(); void SetUnderwaterRoof(); -private: /* 0x4 */ bool mObject; /* 0x5 */ bool mCamera; /* 0x6 */ bool mLink; diff --git a/include/d/d_bg_s_roof_chk.h b/include/d/d_bg_s_roof_chk.h index 387c05fff2..e404eef0c4 100644 --- a/include/d/d_bg_s_roof_chk.h +++ b/include/d/d_bg_s_roof_chk.h @@ -17,7 +17,6 @@ public: f32 GetNowY() { return mNowY; } cXyz* GetPosP() { return &m_pos; } -private: /* 0x3C */ cXyz m_pos; /* 0x48 */ int field_0x48; /* 0x4C */ f32 mNowY; diff --git a/include/d/d_bg_s_spl_grp_chk.h b/include/d/d_bg_s_spl_grp_chk.h index 447bbf4d73..46df7df35a 100644 --- a/include/d/d_bg_s_spl_grp_chk.h +++ b/include/d/d_bg_s_spl_grp_chk.h @@ -30,7 +30,6 @@ public: cXyz& GetPosP() { return m_ground; } f32 GetRoof() { return m_roof; } -private: /* 0x3C */ cXyz m_ground; /* 0x48 */ f32 m_roof; /* 0x4C */ f32 m_height; diff --git a/include/d/d_bg_w.h b/include/d/d_bg_w.h index ae37d1c6d9..a9d61822b8 100644 --- a/include/d/d_bg_w.h +++ b/include/d/d_bg_w.h @@ -346,7 +346,6 @@ public: void SetArrowStickCallback(dBgW_ArrowStickCallback func) { m_arrow_stick_callback = func; } void OnMoveFlag() { m_flags |= (u8)1; } -private: /* 0xB0 */ dBgW_CrrFunc m_crr_func; /* 0xB4 */ dBgW_RideCallback m_ride_callback; /* 0xB8 */ dBgW_ArrowStickCallback m_arrow_stick_callback; diff --git a/include/d/d_bg_w_base.h b/include/d/d_bg_w_base.h index 6940df06fa..f30604d2d3 100644 --- a/include/d/d_bg_w_base.h +++ b/include/d/d_bg_w_base.h @@ -124,7 +124,6 @@ public: void OnPushPullOk() { m_pushPull_Ok = true; } void OffPushPullOk() { m_pushPull_Ok = false; } -private: /* 0x08 */ u8 m_priority; /* 0x09 */ u8 m_roomId; /* 0x0A */ u8 field_0xa; diff --git a/include/d/d_bg_w_kcol.h b/include/d/d_bg_w_kcol.h index 84b0da03f2..42a33b197e 100644 --- a/include/d/d_bg_w_kcol.h +++ b/include/d/d_bg_w_kcol.h @@ -117,7 +117,6 @@ public: void getTri1Pos(KC_PrismData* pd, Vec** nrm) const { *nrm = &m_pkc_head->m_pos_data[pd->pos_i]; } -private: /* 0x18 */ KC_Header* m_pkc_head; /* 0x1C */ dBgPlc m_code; /* 0x20 */ cM3dGAab m_bnd; diff --git a/include/d/d_cc_d.h b/include/d/d_cc_d.h index 40ffae33da..739abdcaa4 100644 --- a/include/d/d_cc_d.h +++ b/include/d/d_cc_d.h @@ -179,7 +179,6 @@ public: cXyz* GetHitPosP() { return &mHitPos; } void ClrHit() { dCcD_GAtTgCoCommonBase::ClrActorInfo(); } - // private: /* 0x1C */ u8 mSe; /* 0x1D */ u8 mMtrl; /* 0x1E */ u8 mHitMark; @@ -215,7 +214,6 @@ public: u8 GetSe() { return mSe; } void ClrHit() { dCcD_GAtTgCoCommonBase::ClrActorInfo(); } -private: /* 0x1C */ u8 mSe; /* 0x1D */ u8 mMtrl; /* 0x1E */ u8 mHitMark; @@ -258,7 +256,6 @@ public: void SetTgSpl(dCcG_Tg_Spl spl) { mTg = spl; } void OnNoActor() { field_0x1C |= 1; } - // private: /* 0x04 */ u8 mAt; /* 0x05 */ u8 mTg; /* 0x06 */ u8 mRoomId; diff --git a/include/d/d_cc_mass_s.h b/include/d/d_cc_mass_s.h index 672adb913a..291cb4552c 100644 --- a/include/d/d_cc_mass_s.h +++ b/include/d/d_cc_mass_s.h @@ -6,7 +6,7 @@ typedef void (*dCcMassS_ObjCallback)(fopAc_ac_c*, cXyz*, u32); class dCcMassS_Obj { -private: +public: /* 0x00 */ cCcD_Obj* mpObj; /* 0x04 */ u8 mPriority; /* 0x08 */ dCcMassS_ObjCallback mpAreaCheckFunc; @@ -28,7 +28,7 @@ public: STATIC_ASSERT(0x20 == sizeof(dCcMassS_Obj)); class dCcMassS_HitInf { -private: +public: /* 0x00 */ cCcD_Obj* mpArea; /* 0x04 */ cCcD_Obj* mpAtObj; /* 0x08 */ cCcD_Obj* mpCoObj; diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index 62b8744b51..dcf681162f 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -249,7 +249,6 @@ public: ~dComIfG_resLoader_c(); int load(char const**, JKRHeap*); -private: /* 0x0 */ const char** mResNameTable; /* 0x4 */ request_of_phase_process_class mPhase; /* 0xC */ u8 mLoadIndex; diff --git a/include/d/d_cursor_mng.h b/include/d/d_cursor_mng.h index 38ba03f214..9837e6f1cb 100644 --- a/include/d/d_cursor_mng.h +++ b/include/d/d_cursor_mng.h @@ -95,7 +95,7 @@ class dCsr_mng_c { BOOL set(mDoGph_gInf_c::csr_c* i_csr, u16, u8, u8); }; -private: +public: dCsr_mng_c() : is_csr_on(true) { } @@ -116,7 +116,6 @@ public: static dCsr_mng_c* m_myObj; -private: /* 0x00 */ list_c m_csr_list; /* 0x08 */ list_c m_obj_list; /* 0x10 */ bool is_csr_on; diff --git a/include/d/d_demo.h b/include/d/d_demo.h index 8eef24d7e3..a35c44e0ed 100644 --- a/include/d/d_demo.h +++ b/include/d/d_demo.h @@ -155,7 +155,6 @@ public: f32 getAnmTransition() { return mAnmTransition; } u32 getShapeId() { return mShape; } -private: /* 0x04 */ u16 mFlags; /* 0x08 */ cXyz mTrans; /* 0x14 */ cXyz mScale; @@ -220,7 +219,6 @@ public: f32 getFovy() { return mProjFovy; } f32 getRoll() { return mViewRoll; } -private: /* 0x04 */ u8 mFlags; /* 0x08 */ f32 mProjNear; /* 0x0C */ f32 mProjFar; @@ -247,7 +245,6 @@ public: void onEnable(u8 flag) { mFlags |= flag; } -private: /* 0x04 */ u8 mFlags; /* 0x05 */ GXColor mColor; }; @@ -275,7 +272,6 @@ public: void onEnable(u8 flag) { mFlags |= flag; } -private: /* 0x04 */ u8 mFlags; /* 0x08 */ JStage::TELight mLightType; /* 0x0C */ GXDistAttnFn mDistAttenFn; @@ -309,7 +305,6 @@ public: void onEnable(u8 flag) { mFlags |= flag; } -private: /* 0x04 */ u8 mFlags; /* 0x05 */ s8 mFogType; /* 0x08 */ f32 mStartZ; @@ -327,7 +322,6 @@ public: void setObject(dDemo_object_c* i_object) { mpObject = i_object; } -private: /* 0x4 */ dDemo_object_c* mpObject; }; diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index 25d92aff54..7965793dcf 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -107,7 +107,6 @@ public: mRnd.init(r0, r1, r2); } -private: /* 0x04 */ cM_rnd_c mRnd; /* 0x10 */ cXyz field_0x10; /* 0x1C */ GXColor mLineColor; @@ -129,7 +128,6 @@ public: void setAlpha(u8 alpha) { mAlpha = alpha; } J2DPicture* getPicture() { return &mpPicture; } -private: /* 0x004 */ u8 field_0x4; /* 0x008 */ J2DPicture mpPicture; /* 0x158 */ s16 mPosX; @@ -271,7 +269,6 @@ public: void setZsortNext(dDlst_shadowReal_c* next) { mZsortNext = next; } void setZsortPre(dDlst_shadowReal_c* pre) { mZsortPre = pre; } -private: /* 0x0000 */ u8 mState; /* 0x0001 */ u8 field_0x1; /* 0x0002 */ u8 mModelNum; @@ -303,7 +300,6 @@ public: static DUSK_GAME_DATA TGXTexObj mSimpleTexObj; -private: /* 0x00000 */ u8 field_0x0; /* 0x00001 */ u8 mRealNum; /* 0x00002 */ u8 mSimpleNum; @@ -332,7 +328,6 @@ public: view_port_class* getViewPort() { return &mViewport; } scissor_class* getScissor() { return &mViewport.scissor; } -private: /* 0x00 */ view_port_class mViewport; /* 0x28 */ s8 mCameraID; /* 0x29 */ u8 mMode; @@ -518,7 +513,6 @@ public: static DUSK_GAME_DATA f32 mWipeSpeed; static DUSK_GAME_DATA u8 mWipe; -private: /* 0x00000 */ J3DDrawBuffer* mDrawBuffers[DB_LIST_MAX]; /* 0x00054 */ dDlst_base_c* mpCopy2DDrawLists[4]; /* 0x00064 */ dDlst_base_c** mpCopy2DStart; diff --git a/include/d/d_event_data.h b/include/d/d_event_data.h index eef55b1164..809ab93eef 100644 --- a/include/d/d_event_data.h +++ b/include/d/d_event_data.h @@ -190,7 +190,6 @@ public: int getCurrentCut() { return mCurrentCut; } int getStartCut() { return mStartCut; } - // private: /* 0x00 */ char mName[8]; /* 0x08 */ u8 mWork[0x18]; // PROBLEM: this buffer is now too small for StaffWork to fit in /* 0x20 */ BE(s32) mTagID; @@ -293,7 +292,6 @@ public: static const int FlagMax = 0x2800; -private: u32 mFlags[320]; }; // Size = 0x500 @@ -346,7 +344,6 @@ public: void setIDataP(int* p_idata) { mIDataP = p_idata; } void setSDataP(char* p_sdata) { mSDataP = p_sdata; } - // private: /* 0x00 */ event_binary_data_header* mHeaderP; /* 0x04 */ dEvDtEvent_c* mEventP; /* 0x08 */ dEvDtStaff_c* mStaffP; diff --git a/include/d/d_event_manager.h b/include/d/d_event_manager.h index de046797ff..75aa5a4a03 100644 --- a/include/d/d_event_manager.h +++ b/include/d/d_event_manager.h @@ -112,7 +112,6 @@ public: dEvM_HIO_c& getEventHIO(); #endif -private: /* 0x000 */ dEvDtBase_c mEventList[BASE_MAX]; /* 0x18C */ int mCameraPlay; /* 0x190 */ dEvent_exception_c mException; diff --git a/include/d/d_file_sel_info.h b/include/d/d_file_sel_info.h index 37dadbeb1b..89c4272b22 100644 --- a/include/d/d_file_sel_info.h +++ b/include/d/d_file_sel_info.h @@ -37,7 +37,6 @@ public: CPaneMgrAlpha* getNoDatBase() { return mNoDatBase; } void draw() { _draw(); } -// private: /* 0x04 */ JKRArchive* mArchive; /* 0x08 */ dDlst_FileInfo_c mFileInfo; /* 0x1C */ u8 field_0x1c[4]; diff --git a/include/d/d_kantera_icon_meter.h b/include/d/d_kantera_icon_meter.h index 67e2dff278..cf1464e82f 100644 --- a/include/d/d_kantera_icon_meter.h +++ b/include/d/d_kantera_icon_meter.h @@ -13,7 +13,6 @@ public: void setScreen(J2DScreen* screen) { mp_scrn = screen; } J2DScreen* getScreen() { return mp_scrn; } -private: /* 0x04 */ J2DScreen* mp_scrn; }; @@ -30,7 +29,6 @@ public: void drawSelf() { mpKanteraIcon->draw(); } -// private: /* 0x04 */ dDlst_KanteraIcon_c* mpKanteraIcon; /* 0x08 */ CPaneMgr* mpParent; /* 0x0C */ CPaneMgr* mpGauge; diff --git a/include/d/d_ky_thunder.h b/include/d/d_ky_thunder.h index 1e174ad6f8..5a72252a9a 100644 --- a/include/d/d_ky_thunder.h +++ b/include/d/d_ky_thunder.h @@ -25,7 +25,6 @@ public: ~dThunder_c() { mDoExt_destroySolidHeap(mpHeap); } -private: /* 0x0F8 */ JKRSolidHeap* mpHeap; /* 0x0FC */ dThunder_modelInfo_c mModelInfo; /* 0x138 */ cXyz field_0x138; diff --git a/include/d/d_map.h b/include/d/d_map.h index b42def27c7..b70238cc46 100644 --- a/include/d/d_map.h +++ b/include/d/d_map.h @@ -134,7 +134,6 @@ public: static const int PALETTE_NUMBER = 50; #endif -private: /* 0x34 */ s32 m_outSideBlackLineCnt; /* 0x38 */ s32 field_0x38; /* 0x3C */ s32 field_0x3c; @@ -199,7 +198,6 @@ public: static dMap_c* m_mySelfPointer; -private: /* 0x40 */ dMap_prm_res_s* m_res_src; /* 0x44 */ dMap_prm_res_s* m_res; /* 0x48 */ ResTIMG* mResTIMG; diff --git a/include/d/d_menu_collect.h b/include/d/d_menu_collect.h index 0811fb00a6..d2a4028b2e 100644 --- a/include/d/d_menu_collect.h +++ b/include/d/d_menu_collect.h @@ -129,7 +129,6 @@ public: J2DPicture* getBlackTex() { return mpBlackTex; } u8 getSubWindowOpenCheck() { return mSubWindowOpenCheck; } -// private: /* 0x004 */ JKRExpHeap* mpHeap; /* 0x008 */ JKRExpHeap* mpSubHeap; /* 0x00C */ void* field_0xc; @@ -225,7 +224,6 @@ public: static DUSK_GAME_DATA f32 mViewOffsetY; -private: /* 0x004 */ JKRExpHeap* mpHeap; /* 0x008 */ JKRSolidHeap* mpSolidHeap; /* 0x00C */ dMenu_Collect2D_c* mpCollect2D; @@ -260,7 +258,6 @@ public: bool isKeyCheck() { return mpCollect2D->isKeyCheck(); } bool isOutCheck() { return mpCollect2D->isOutCheck(); } -private: /* 0x4 */ dMenu_Collect2D_c* mpCollect2D; /* 0x8 */ dMenu_Collect3D_c* mpCollect3D; }; diff --git a/include/d/d_menu_dmap.h b/include/d/d_menu_dmap.h index 4d1341cc67..039b42aab2 100644 --- a/include/d/d_menu_dmap.h +++ b/include/d/d_menu_dmap.h @@ -255,7 +255,6 @@ public: static DUSK_GAME_DATA dMenu_Dmap_c* myclass; -private: /* 0x004 */ dMenu_DmapMapCtrl_c* mMapCtrl; /* 0x008 */ dMenu_DmapBg_c* mpDrawBg; /* 0x00C */ u8 field_0xc[0x10 - 0xC]; diff --git a/include/d/d_menu_fishing.h b/include/d/d_menu_fishing.h index f2e9419ce3..b3b451c968 100644 --- a/include/d/d_menu_fishing.h +++ b/include/d/d_menu_fishing.h @@ -43,7 +43,6 @@ public: u8 getStatus() { return mStatus; } -// private: /* 0x004 */ JKRExpHeap* mpHeap; /* 0x008 */ JKRArchive* mpArchive; /* 0x00C */ STControl* mpStick; diff --git a/include/d/d_menu_fmap.h b/include/d/d_menu_fmap.h index 2e5ee95772..3104d7e76b 100644 --- a/include/d/d_menu_fmap.h +++ b/include/d/d_menu_fmap.h @@ -270,7 +270,6 @@ public: static DUSK_GAME_DATA dMenu_Fmap_c* MyClass; -// private: /* 0x004 */ JKRExpHeap* mpHeap; /* 0x008 */ JKRExpHeap* mpTalkHeap; /* 0x00C */ STControl* mpStick; diff --git a/include/d/d_menu_insect.h b/include/d/d_menu_insect.h index 5e0b453949..43f4af0602 100644 --- a/include/d/d_menu_insect.h +++ b/include/d/d_menu_insect.h @@ -60,7 +60,6 @@ public: u8 getStatus() { return mStatus; } -// private: /* 0x04 */ JKRExpHeap* mpHeap; /* 0x08 */ JKRArchive* mpArchive; /* 0x0C */ STControl* mpStick; diff --git a/include/d/d_menu_item_explain.h b/include/d/d_menu_item_explain.h index 7b79ebbad5..59d212e53f 100644 --- a/include/d/d_menu_item_explain.h +++ b/include/d/d_menu_item_explain.h @@ -51,7 +51,6 @@ public: field_0xd8 = y; } -private: /* 0x04 */ JKRExpHeap* mpHeap; /* 0x08 */ JKRArchive* mpArchive; /* 0x0C */ dMsgString_c* mpInfoString; diff --git a/include/d/d_menu_letter.h b/include/d/d_menu_letter.h index 21747c7e78..8e112f04d2 100644 --- a/include/d/d_menu_letter.h +++ b/include/d/d_menu_letter.h @@ -64,7 +64,6 @@ public: u8 getStatus() { return mStatus; } -// private: /* 0x004 */ JKRExpHeap* mpHeap; /* 0x008 */ JKRArchive* mpArchive; /* 0x00C */ STControl* mpStick; diff --git a/include/d/d_menu_option.h b/include/d/d_menu_option.h index f158498dd7..ff4b84f5e3 100644 --- a/include/d/d_menu_option.h +++ b/include/d/d_menu_option.h @@ -117,7 +117,6 @@ public: return ((u8)mUseFlag & (u8)i_flag) != 0 ? true : false; } -// private: /* 0x004 */ J2DScreen* mpBackScreen; /* 0x008 */ J2DScreen* mpScreen; /* 0x00C */ J2DScreen* mpClipScreen; diff --git a/include/d/d_menu_ring.h b/include/d/d_menu_ring.h index d0f021339e..fa4f97496f 100644 --- a/include/d/d_menu_ring.h +++ b/include/d/d_menu_ring.h @@ -84,7 +84,6 @@ public: void drawFlag0() { mDrawFlag = 0; } void setStatus(u8 i_status) { mStatus = i_status; } -// private: /* 0x004 */ JKRExpHeap* mpHeap; /* 0x008 */ STControl* mpStick; /* 0x00C */ CSTControl* mpCStick; diff --git a/include/d/d_menu_save.h b/include/d/d_menu_save.h index 7e94d1d1c9..a237bbb849 100644 --- a/include/d/d_menu_save.h +++ b/include/d/d_menu_save.h @@ -27,7 +27,6 @@ public: void setScrnExplain(dMsgScrnExplain_c* p_scrn) { mpScrn = p_scrn; } -private: /* 0x4 */ dMsgScrnExplain_c* mpScrn; }; @@ -278,7 +277,6 @@ public: u8 getEndStatus() { return mEndStatus; } void setUseType(u8 type) { mUseType = type; } -// private: /* 0x0004 */ JKRArchive* mpArchive; /* 0x0008 */ mDoDvdThd_mountArchive_c* mpMount; /* 0x000C */ STControl* stick; diff --git a/include/d/d_menu_skill.h b/include/d/d_menu_skill.h index d21332c341..2c2dc445d1 100644 --- a/include/d/d_menu_skill.h +++ b/include/d/d_menu_skill.h @@ -58,7 +58,6 @@ public: u8 getStatus() { return mStatus; } -// private: /* 0x004 */ JKRExpHeap* mpHeap; /* 0x008 */ JKRArchive* mpArchive; /* 0x00C */ STControl* mpStick; diff --git a/include/d/d_menu_window.h b/include/d/d_menu_window.h index 65e415077d..1c5aeadbe5 100644 --- a/include/d/d_menu_window.h +++ b/include/d/d_menu_window.h @@ -193,7 +193,6 @@ public: bool isShowFlag() { return (mShowFlag & 1) != 0; } bool isFadeNowCheck() { return mDoGph_gInf_c::getFader()->getStatus() == 1; } -private: /* 0x0FC */ int field_0xfc; /* 0x100 */ JKRExpHeap* mpHeap; /* 0x104 */ STControl* mpStick; diff --git a/include/d/d_meter2.h b/include/d/d_meter2.h index c8dc17bca8..4246d9249d 100644 --- a/include/d/d_meter2.h +++ b/include/d/d_meter2.h @@ -100,7 +100,6 @@ public: bool isShowFlag(int i_no) { return field_0x1e6 & (1 << i_no); } void onShowFlag(int i_no) { field_0x1e6 |= (1 << i_no); } -private: /* 0x0FC */ int field_0xfc; /* 0x100 */ JKRExpHeap* mpHeap; /* 0x104 */ JKRExpHeap* mpSubHeap; diff --git a/include/d/d_meter2_draw.h b/include/d/d_meter2_draw.h index aaad9dec70..c9dc8217e9 100644 --- a/include/d/d_meter2_draw.h +++ b/include/d/d_meter2_draw.h @@ -154,7 +154,6 @@ public: } #endif -// private: /* 0x004 */ item_params mItemParams[4]; /* 0x074 */ JKRExpHeap* heap; /* 0x078 */ J2DScreen* mpScreen; diff --git a/include/d/d_meter_map.h b/include/d/d_meter_map.h index b17f51846e..648fb5aef5 100644 --- a/include/d/d_meter_map.h +++ b/include/d/d_meter_map.h @@ -102,7 +102,6 @@ public: /* 0x04 */ u8 field_0x4_debug; /* 0x08 */ int field_0x8_debug; #endif -private: /* 0x04 */ J2DPicture* mMapJ2DPicture; /* 0x08 */ dMap_c* mMap; /* 0x0C */ s32 mIsCompass; diff --git a/include/d/d_model.h b/include/d/d_model.h index 72949f5f03..466592d89c 100644 --- a/include/d/d_model.h +++ b/include/d/d_model.h @@ -33,7 +33,6 @@ public: u16 getMaterialId() { return mMaterialId; } dKy_tevstr_c* getTevstr() { return mpTevstr; } -private: /* 0x10 */ J3DModelData* mpModelData; /* 0x14 */ dKy_tevstr_c* mpTevstr; /* 0x18 */ u16 mMaterialId; @@ -55,7 +54,6 @@ public: static DUSK_GAME_DATA dMdl_mng_c* m_myObj; -private: /* 0x00 */ dMdl_c field_0x0[4]; /* 0x80 */ u8 field_0x80; }; diff --git a/include/d/d_msg_flow.h b/include/d/d_msg_flow.h index cff5857cb7..eeece6f4fa 100644 --- a/include/d/d_msg_flow.h +++ b/include/d/d_msg_flow.h @@ -188,7 +188,6 @@ public: static DUSK_GAME_DATA queryFunc mQueryList[53]; static DUSK_GAME_DATA eventFunc mEventList[43]; -private: /* 0x04 */ u8* mFlow_p; /* 0x08 */ u8* mLabelInfo_p; /* 0x0C */ union mesg_flow { diff --git a/include/d/d_msg_out_font.h b/include/d/d_msg_out_font.h index c6715757eb..3bd41ca825 100644 --- a/include/d/d_msg_out_font.h +++ b/include/d/d_msg_out_font.h @@ -25,7 +25,6 @@ public: void setTextBoxPtr(J2DTextBox* p_textBox) { mpTextBoxPtr = p_textBox; } void resetType() { mType = 0x47; } -// private: /* 0x04 */ J2DTextBox* mpTextBoxPtr; /* 0x08 */ f32 mPosX; /* 0x0C */ f32 mPosY; @@ -53,7 +52,6 @@ public: void setRupeeColor(u8 color) { mRupeeColor = color; } -// private: /* 0x004 */ COutFontSet_c* mpOfs[35]; /* 0x090 */ J2DPicture* mpPane[70]; /* 0x1A8 */ f32 mAlphaRatio; diff --git a/include/d/d_msg_scrn_3select.h b/include/d/d_msg_scrn_3select.h index 1cb92e5be6..35c831d3c5 100644 --- a/include/d/d_msg_scrn_3select.h +++ b/include/d/d_msg_scrn_3select.h @@ -60,7 +60,6 @@ public: void offAnimeUpdate(int param_0) { field_0x114 &= ~(u8)(1 << param_0); } u8 getDPDPoint() { return mDPDPoint; } -private: /* 0x004 */ J2DScreen* mpScreen; /* 0x008 */ J2DAnmTransform* mpAnmBck; /* 0x00C */ J2DAnmColorKey* mpAnmBpk; diff --git a/include/d/d_msg_scrn_boss.h b/include/d/d_msg_scrn_boss.h index d72c992b39..3adcc57289 100644 --- a/include/d/d_msg_scrn_boss.h +++ b/include/d/d_msg_scrn_boss.h @@ -15,7 +15,6 @@ public: virtual void fontAlpha(f32); virtual void fukiAlpha(f32); -private: /* 0xC4 */ CPaneMgr* mpBaseParent; /* 0xC8 */ CPaneMgr* mpFontParent; }; diff --git a/include/d/d_msg_scrn_explain.h b/include/d/d_msg_scrn_explain.h index 20931ec9ac..1b638f9b83 100644 --- a/include/d/d_msg_scrn_explain.h +++ b/include/d/d_msg_scrn_explain.h @@ -49,7 +49,6 @@ public: void onForceSelect() { mForceSelect = 1; } void setKeyWaitTimer(s16 timer) { mKeyWaitTimer = timer; } -private: /* 0x04 */ dMsgString_c* mpString_c; /* 0x08 */ CPaneMgr* mpTm_c[2]; /* 0x10 */ CPaneMgr* mpTmr_c[2]; diff --git a/include/d/d_msg_string.h b/include/d/d_msg_string.h index 45a148b401..2d92939141 100644 --- a/include/d/d_msg_string.h +++ b/include/d/d_msg_string.h @@ -39,7 +39,6 @@ public: drawOutFontLocal(param_0, param_1); } -private: /* 0x24 */ COutFont_c* mpOutFont; /* 0x28 */ u8 field_0x28; }; diff --git a/include/d/d_msg_string_base.h b/include/d/d_msg_string_base.h index 4624393f06..020c557f85 100644 --- a/include/d/d_msg_string_base.h +++ b/include/d/d_msg_string_base.h @@ -30,7 +30,6 @@ public: virtual void drawOutFontLocal(J2DTextBox*, f32); virtual void drawFontLocal(J2DTextBox*, u8, f32, f32, f32, f32, u32, u8); -private: /* 0x04 */ JMessage::TResourceContainer* mpResCont; /* 0x08 */ jmessage_string_tControl* mpCtrl; /* 0x0C */ jmessage_string_tReference* mpRefer; diff --git a/include/d/d_name.h b/include/d/d_name.h index ddd99127c6..de084defb3 100644 --- a/include/d/d_name.h +++ b/include/d/d_name.h @@ -130,7 +130,6 @@ public: void setNextNameStr(char* i_name) { SAFE_STRCPY(mNextNameStr,i_name); } void draw() { _draw(); } -private: /* 0x004 */ STControl* stick; /* 0x008 */ JKRArchive* archive; /* 0x00C */ dDlst_NameIN_c nameIn; diff --git a/include/d/d_pane_class.h b/include/d/d_pane_class.h index 345cae1274..ffc067e411 100644 --- a/include/d/d_pane_class.h +++ b/include/d/d_pane_class.h @@ -93,7 +93,6 @@ public: JUtility::TColor getInitBlack() { return mInitBlack; } JUtility::TColor getInitWhite() { return mInitWhite; } -private: /* 0x1C */ void* mpFirstStackSize; /* 0x20 */ s16* field_0x20; /* 0x24 */ JGeometry::TVec2 mInitPos; diff --git a/include/d/d_pane_class_alpha.h b/include/d/d_pane_class_alpha.h index 82590e5f02..cf38229b97 100644 --- a/include/d/d_pane_class_alpha.h +++ b/include/d/d_pane_class_alpha.h @@ -54,7 +54,6 @@ public: virtual ~CPaneMgrAlphaMorf(); -private: /* 0x1C */ void* mpFirstSaveAlpha; /* 0x20 */ u8* field_0x20; /* 0x24 */ void* mpFirstGetAlpha; diff --git a/include/d/d_particle.h b/include/d/d_particle.h index 7ae4d12c07..a5849288f3 100644 --- a/include/d/d_particle.h +++ b/include/d/d_particle.h @@ -261,7 +261,6 @@ public: void setRate(f32 rate) { mRate = rate; } void setMaxCnt(int i_maxCnt) { mMaxCnt = i_maxCnt; } -private: /* 0x04 */ f32 mRate; /* 0x08 */ int mMaxCnt; /* 0x0C */ cXyz const* field_0xc; @@ -313,7 +312,6 @@ public: u16 getNameId() { return mNameId; } dPa_levelEcallBack* getCallback() { return mCallback; } - private: /* 0x00 */ u32 mId; /* 0x04 */ u16 mNameId; /* 0x06 */ u8 mStatus; @@ -510,7 +508,6 @@ public: static DUSK_GAME_DATA dPa_particleTracePcallBack_c mParticleTracePCB; static DUSK_GAME_DATA u8 mStatus; -private: /* 0x000 */ JKRSolidHeap* mHeap; /* 0x004 */ JPAResourceManager* mCommonResMng; /* 0x008 */ JKRExpHeap* m_resHeap; diff --git a/include/d/d_resorce.h b/include/d/d_resorce.h index b70d2d5452..3330ff5b3d 100644 --- a/include/d/d_resorce.h +++ b/include/d/d_resorce.h @@ -51,7 +51,6 @@ public: static const int NAME_MAX = 9; #endif -private: /* 0x00 */ char mArchiveName[11]; /* 0x0C */ u16 mCount; /* 0x10 */ mDoDvdThd_mountArchive_c* mDMCommand; diff --git a/include/d/d_s_name.h b/include/d/d_s_name.h index 72a44c02de..c32b4b903c 100644 --- a/include/d/d_s_name.h +++ b/include/d/d_s_name.h @@ -56,7 +56,6 @@ public: void tex_data_set(); #endif -private: #if VERSION == VERSION_GCN_PAL u8 field_0x1c4_pal[0x28]; #endif diff --git a/include/d/d_save.h b/include/d/d_save.h index 06458890e4..7fdbccf1df 100644 --- a/include/d/d_save.h +++ b/include/d/d_save.h @@ -594,7 +594,6 @@ public: dSv_player_info_c& getPlayerInfo() { return mPlayerInfo; } dSv_player_config_c& getConfig() { return mConfig; } -private: /* 0x000 */ dSv_player_status_a_c mPlayerStatusA; /* 0x028 */ dSv_player_status_b_c mPlayerStatusB; /* 0x040 */ dSv_horse_place_c mHorsePlace; @@ -892,7 +891,6 @@ public: class dSv_reserve_c { public: -private: u8 unk[80]; }; diff --git a/include/d/d_save_HIO.h b/include/d/d_save_HIO.h index 2ee6e4570b..f7d4770e08 100644 --- a/include/d/d_save_HIO.h +++ b/include/d/d_save_HIO.h @@ -10,7 +10,6 @@ public: virtual ~dSvBit_childTransformHIO_c() {} -private: /* 0x04 */ u8 field_0x4; /* 0x05 */ u8 WF[4]; /* 0x09 */ u8 field_0x9[4]; @@ -23,7 +22,6 @@ public: virtual ~dSvBit_childDarknessHIO_c() {} -private: /* 0x04 */ u8 field_0x4; /* 0x05 */ u8 TW[6]; /* 0x0B */ u8 field_0xB[6]; @@ -36,7 +34,6 @@ public: virtual ~dSvBit_childOtherHIO_c() {} -private: /* 0x04 */ u8 field_0x4; /* 0x05 */ u8 mDropNum; /* 0x06 */ u8 field_0x6; @@ -51,7 +48,6 @@ public: virtual ~dSvBit_childTbPerfectionHIO_c() {} -private: /* 0x04 */ u8 field_0x4; /* 0x05 */ u8 field_0x5[0x40]; /* 0x45 */ u8 field_0x45[0x40]; @@ -64,7 +60,6 @@ public: mPerfectSave.init(); } -private: /* 0x04 */ u8 field_0x4; /* 0x08 */ dSvBit_childTbPerfectionHIO_c mPerfectSave; }; @@ -76,7 +71,6 @@ public: virtual ~dSvBit_childSwZoneHIO_c() {} -private: /* 0x04 */ u8 field_0x4; /* 0x05 */ bool field_0x5[0x20]; /* 0x25 */ bool field_0x25[0x20]; @@ -89,7 +83,6 @@ public: virtual ~dSvBit_childSwPerfectionHIO_c() {} -private: /* 0x04 */ u8 field_0x4; /* 0x05 */ u8 field_0x5[0x80]; /* 0x85 */ u8 field_0x85[0x80]; @@ -102,7 +95,6 @@ public: virtual ~dSvBit_childSwOneZoneHIO_c() {} -private: /* 0x04 */ u8 field_0x4; /* 0x05 */ bool field_0x5[0x10]; /* 0x15 */ bool field_0x15[0x10]; @@ -115,7 +107,6 @@ public: virtual ~dSvBit_childSwDungeonHIO_c() {} -private: /* 0x04 */ u8 field_0x4; /* 0x05 */ u8 field_0x5[0x40]; /* 0x45 */ u8 field_0x45[0x40]; @@ -131,7 +122,6 @@ public: field_0x1e0.init(); } -private: /* 0x004 */ u8 field_0x4; /* 0x008 */ dSvBit_childSwPerfectionHIO_c field_0x8; /* 0x110 */ dSvBit_childSwDungeonHIO_c field_0x110; @@ -146,7 +136,6 @@ public: virtual ~dSvBit_childItZoneHIO_c() {} -private: /* 0x04 */ u8 field_0x4; /* 0x05 */ u8 field_0x5[0x20]; /* 0x25 */ u8 field_0x25[0x20]; @@ -159,7 +148,6 @@ public: virtual ~dSvBit_childItPerfectionHIO_c() {} -private: /* 0x04 */ u8 field_0x4; /* 0x05 */ u8 field_0x5[0x20]; /* 0x25 */ u8 field_0x25[0x20]; @@ -172,7 +160,6 @@ public: virtual ~dSvBit_childItOneZoneHIO_c() {} -private: /* 0x04 */ u8 field_0x4; /* 0x05 */ u8 field_0x5[0x10]; /* 0x15 */ u8 field_0x15[0x10]; @@ -185,7 +172,6 @@ public: virtual ~dSvBit_childItDungeonHIO_c() {} -private: /* 0x04 */ u8 field_0x4; /* 0x05 */ u8 field_0x5[0x80]; /* 0x85 */ u8 field_0x85[0x80]; @@ -201,7 +187,6 @@ public: mOneZoneSave.init(); } -private: /* 0x004 */ u8 field_0x4; /* 0x008 */ dSvBit_childItPerfectionHIO_c mFullSave; /* 0x050 */ dSvBit_childItDungeonHIO_c mDungeonSave; diff --git a/include/d/d_select_cursor.h b/include/d/d_select_cursor.h index e98db19731..766463b5b3 100644 --- a/include/d/d_select_cursor.h +++ b/include/d/d_select_cursor.h @@ -66,7 +66,6 @@ public: void onPlayAllAnime() { field_0xb4 = 0xff; } void offPlayAllAnime() { field_0xb4 = 0; } -private: /* 0x04 */ J2DScreen* mpScreen; /* 0x08 */ J2DPane* mpPane; /* 0x0C */ dSelect_icon_c* mpSelectIcon; diff --git a/include/d/d_shop_item_ctrl.h b/include/d/d_shop_item_ctrl.h index 9016be18ea..61ed325241 100644 --- a/include/d/d_shop_item_ctrl.h +++ b/include/d/d_shop_item_ctrl.h @@ -18,7 +18,6 @@ public: void setMessageIndex(int i, u16 messageIndex) { mMessageIndex[i] = messageIndex; } u16 getMessageIndex(int i) { return mMessageIndex[i]; } -private: /* 0x04 */ u32 mItemIndex[7]; /* 0x20 */ u16 mMessageIndex[7]; }; diff --git a/include/d/d_simple_model.h b/include/d/d_simple_model.h index 25b9e6e2d1..e87462c318 100644 --- a/include/d/d_simple_model.h +++ b/include/d/d_simple_model.h @@ -36,7 +36,6 @@ public: void setIdx(u8 idx) { this->idx = idx; } #endif -private: /* 0x00 */ JKRSolidHeap* mpHeap; /* 0x04 */ J3DModel* mpModel; /* 0x08 */ int mCreateNum; @@ -59,7 +58,6 @@ public: virtual ~dSmplMdl_draw_c(); -private: /* 0x04 */ diff_model_c mModel[8]; /* 0xA4 */ int mListCount; /* 0xA8 */ modelList_c mList[500]; diff --git a/include/d/d_stage.h b/include/d/d_stage.h index f323726f6e..cb2ed0b513 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -547,7 +547,6 @@ public: /* vt[91] */ virtual void setElst(dStage_Elst_c*) = 0; /* vt[92] */ virtual dStage_Elst_c* getElst(void) = 0; -private: /* 0x04 */ s8 mRoomNo; }; @@ -1261,7 +1260,6 @@ public: static u8 mNoArcBank; #endif -private: /* 0x0 */ u8 field_0x0[4]; }; @@ -1276,7 +1274,6 @@ public: s8 getDarkArea() const { return mDarkArea; } void setDarkArea(s8 darkArea) { mDarkArea = darkArea; } -private: /* 0x0 */ char mName[8]; /* 0x8 */ s16 mPoint; /* 0xA */ s8 mRoomNo; @@ -1297,7 +1294,6 @@ public: u8 getWipeSpeed() const { return wipe_speed; } dStage_startStage_c* getStartStage() { return this; } -private: s8 enabled; s8 wipe; u8 wipe_speed; diff --git a/include/d/d_timer.h b/include/d/d_timer.h index 104a4cae9e..de145650ac 100644 --- a/include/d/d_timer.h +++ b/include/d/d_timer.h @@ -77,7 +77,6 @@ public: mTimerTransY = y; } -private: /* 0x004 */ J2DScreen* mpScreen; /* 0x008 */ J2DScreen* mpGetInScreen; /* 0x00C */ J2DAnmTransform* mpGetInBck; @@ -145,7 +144,6 @@ public: u8 isReadyFlag() { return m_is_ready; } -private: /* 0x0FC */ dDlst_TimerScrnDraw_c* mp_tm_scrn; /* 0x100 */ JKRExpHeap* mp_heap; /* 0x104 */ u8 field_0x104[4]; diff --git a/include/d/d_vibration.h b/include/d/d_vibration.h index b61d0099b4..6e886a314b 100644 --- a/include/d/d_vibration.h +++ b/include/d/d_vibration.h @@ -94,7 +94,6 @@ public: static DUSK_GAME_DATA const vib_pattern MQ_patt[VIBMODE_Q_MAX]; static DUSK_GAME_DATA const vib_pattern CQ_patt[VIBMODE_Q_MAX]; -private: #if DEBUG /* 0x00 */ dVibTest_c mVibTest; #elif PARTIAL_DEBUG diff --git a/include/m_Do/m_Do_dvd_thread.h b/include/m_Do/m_Do_dvd_thread.h index ebb4253838..dcb3f2fc65 100644 --- a/include/m_Do/m_Do_dvd_thread.h +++ b/include/m_Do/m_Do_dvd_thread.h @@ -68,7 +68,7 @@ public: JKRMemArchive* getArchive() const { return mArchive; } JKRHeap* getHeap() const { return mHeap; } -// private: +private: /* 0x14 */ u8 mMountDirection; /* 0x18 */ s32 mEntryNumber; /* 0x1C */ JKRMemArchive* mArchive;